mirror of
https://github.com/git/git.git
synced 2024-12-15 04:46:02 +08:00
0a8e3036a3
Since2f328c3d("reset $sha1 $pathspec: require $sha1 only to be treeish", 2013-01-14), we allowed "git reset $object -- $path" to reset individual paths that match the pathspec to take the blob from a tree object, not necessarily a commit, while the form to reset the tip of the current branch to some other commit still must be given a commit. Like resetting with paths, "git reset --patch" does not update HEAD, and need not require a commit. The path-filtered form, "git reset --patch $object -- $pathspec", has accepted a tree-ish since2f328c3d. "git reset --patch" is documented as accepting a <tree-ish> sincebf44142f("reset: update documentation to require only tree-ish with paths", 2013-01-16). Documentation changes are not required. Loosen the restriction that requires a commit for the unfiltered "git reset --patch $object". Signed-off-by: Nika Layzell <nika@thelayzells.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
93 lines
2.5 KiB
Bash
Executable File
93 lines
2.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git reset --patch'
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success PERL 'setup' '
|
|
mkdir dir &&
|
|
echo parent > dir/foo &&
|
|
echo dummy > bar &&
|
|
git add dir &&
|
|
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 foo, so the first 'n' is always to skip 'bar'
|
|
|
|
test_expect_success PERL 'saying "n" does nothing' '
|
|
set_and_save_state dir/foo work work &&
|
|
test_write_lines n n | git reset -p &&
|
|
verify_saved_state dir/foo &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p' '
|
|
test_write_lines n y | git reset -p >output &&
|
|
verify_state dir/foo work head &&
|
|
verify_saved_state bar &&
|
|
test_i18ngrep "Unstage" output
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p HEAD^' '
|
|
test_write_lines n y | git reset -p HEAD^ >output &&
|
|
verify_state dir/foo work parent &&
|
|
verify_saved_state bar &&
|
|
test_i18ngrep "Apply" output
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p HEAD^^{tree}' '
|
|
test_write_lines n y | git reset -p HEAD^^{tree} >output &&
|
|
verify_state dir/foo work parent &&
|
|
verify_saved_state bar &&
|
|
test_i18ngrep "Apply" output
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' '
|
|
set_and_save_state dir/foo work work &&
|
|
test_must_fail git reset -p HEAD^:dir/foo &&
|
|
verify_saved_state dir/foo &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p aaaaaaaa (unknown fails)' '
|
|
set_and_save_state dir/foo work work &&
|
|
test_must_fail git reset -p aaaaaaaa &&
|
|
verify_saved_state dir/foo &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
# 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 PERL 'git reset -p dir' '
|
|
set_state dir/foo work work &&
|
|
test_write_lines y n | git reset -p dir &&
|
|
verify_state dir/foo work head &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p -- foo (inside dir)' '
|
|
set_state dir/foo work work &&
|
|
test_write_lines y n | (cd dir && git reset -p -- foo) &&
|
|
verify_state dir/foo work head &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
test_expect_success PERL 'git reset -p HEAD^ -- dir' '
|
|
test_write_lines y n | git reset -p HEAD^ -- dir &&
|
|
verify_state dir/foo work parent &&
|
|
verify_saved_state bar
|
|
'
|
|
|
|
test_expect_success PERL 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
|
|
test_done
|