mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
5a8ed3fe45
Currently, (restore, checkout, reset) commands correctly take '@' as a synonym for 'HEAD'. However, in patch mode different prompts/messages are given on command line due to patch mode machinery not considering '@' to be a synonym for 'HEAD' due to literal string comparison with the word 'HEAD', and therefore assigning patch_mode_($command)_nothead and triggering reverse mode (-R in diff-index). The NEEDSWORK comment suggested comparing commit objects to get around this. However, doing so would also take a non-checked out branch pointing to the same commit as HEAD, as HEAD. This would cause confusion to the user. Therefore, after parsing '@', replace it with 'HEAD' as reasonably early as possible. This also solves another problem of disparity between 'git checkout HEAD' and 'git checkout @' (latter detaches at the HEAD commit and the former does not). Trade-offs: - Some of the errors would show the revision argument as 'HEAD' when given '@'. This should be fine, as most users who probably use '@' would be aware that it is a shortcut for 'HEAD' and most probably used to use 'HEAD'. There is also relevant documentation in 'gitrevisions' manpage about '@' being the shortcut for 'HEAD'. Also, the simplicity of the solution far outweighs this cost. - Consider '@' as a shortcut for 'HEAD' even if 'refs/heads/@' exists at a different commit. Naming a branch '@' is an obvious foot-gun and many existing commands already take '@' for 'HEAD' even if 'refs/heads/@' exists at a different commit or does not exist at all (e.g. 'git log @', 'git push origin @' etc.). Therefore this is an existing assumption and should not be a problem. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Phillip Wood <phillip.wood123@gmail.com> Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
133 lines
3.8 KiB
Bash
Executable file
133 lines
3.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git checkout --patch'
|
|
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir dir &&
|
|
echo parent > dir/foo &&
|
|
echo dummy > bar &&
|
|
git add bar dir/foo &&
|
|
git commit -m initial &&
|
|
test_tick &&
|
|
test_commit second dir/foo head &&
|
|
set_and_save_state bar bar_work bar_index &&
|
|
save_head
|
|
'
|
|
|
|
# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
|
|
|
|
test_expect_success 'saying "n" does nothing' '
|
|
set_and_save_state dir/foo work head &&
|
|
test_write_lines n n | git checkout -p &&
|
|
verify_saved_state bar &&
|
|
verify_saved_state dir/foo
|
|
'
|
|
|
|
test_expect_success 'git checkout -p' '
|
|
test_write_lines n y | git checkout -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success 'git checkout -p with staged changes' '
|
|
set_state dir/foo work index &&
|
|
test_write_lines n y | git checkout -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo index index
|
|
'
|
|
|
|
for opt in "HEAD" "@"
|
|
do
|
|
test_expect_success "git checkout -p $opt with NO staged changes: abort" '
|
|
set_and_save_state dir/foo work head &&
|
|
test_write_lines n y n | git checkout -p $opt >output &&
|
|
verify_saved_state bar &&
|
|
verify_saved_state dir/foo &&
|
|
test_grep "Discard" output
|
|
'
|
|
|
|
test_expect_success "git checkout -p $opt with NO staged changes: apply" '
|
|
test_write_lines n y y | git checkout -p $opt >output &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head &&
|
|
test_grep "Discard" output
|
|
'
|
|
|
|
test_expect_success "git checkout -p $opt with change already staged" '
|
|
set_state dir/foo index index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git checkout -p $opt >output &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head &&
|
|
test_grep "Discard" output
|
|
'
|
|
done
|
|
|
|
test_expect_success 'git checkout -p HEAD^...' '
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git checkout -p HEAD^... &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent parent
|
|
'
|
|
|
|
test_expect_success 'git checkout -p HEAD^' '
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git checkout -p HEAD^ &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent parent
|
|
'
|
|
|
|
test_expect_success 'git checkout -p handles deletion' '
|
|
set_state dir/foo work index &&
|
|
rm dir/foo &&
|
|
test_write_lines n y | git checkout -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo index index
|
|
'
|
|
|
|
# The idea in the rest is that bar sorts first, so we always say 'y'
|
|
# first and if the path limiter fails it'll apply to bar instead of
|
|
# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
|
|
# the failure case (and thus get out of the loop).
|
|
|
|
test_expect_success 'path limiting works: dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git checkout -p dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success 'path limiting works: -- dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git checkout -p -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success 'path limiting works: HEAD^ -- dir' '
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines y n n | git checkout -p HEAD^ -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent parent
|
|
'
|
|
|
|
test_expect_success 'path limiting works: foo inside dir' '
|
|
set_state dir/foo work head &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines y n n | (cd dir && git checkout -p foo) &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
test_expect_success 'empty tree can be handled' '
|
|
test_when_finished "git reset --hard" &&
|
|
git checkout -p $(test_oid empty_tree) --
|
|
'
|
|
|
|
test_done
|