mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
5602b500c3
Running `git checkout -p` with a merge-base rev results in an error: $ git checkout -p HEAD... usage: git diff-index [-m] [--cached] [<common-diff-options>] <tree-ish> [<path>...] common diff options: -z output diff-raw with lines terminated with NUL. -p output patch format. -u synonym for -p. --patch-with-raw output both a patch and the diff-raw format. --stat show diffstat instead of patch. --numstat show numeric diffstat instead of patch. --patch-with-stat output a patch and prepend its diffstat. --name-only show only names of changed files. --name-status show names and status of changed files. --full-index show full object name on index lines. --abbrev=<n> abbreviate object names in diff-tree header and diff-raw. -R swap input file pairs. -B detect complete rewrites. -M detect renames. -C detect copies. --find-copies-harder try unchanged files as candidate for copy detection. -l<n> limit rename attempts up to <n> paths. -O<file> reorder diffs according to the <file>. -S<string> find filepair whose only one side contains the string. --pickaxe-all show all files diff when -S is used and hit is found. -a --text treat all files as text. Cannot close git diff-index --cached --numstat --summary HEAD... -- () at <redacted>/libexec/git-core/git-add--interactive line 183. This happens because checkout passes the literal argument (in the example, `HEAD...`) to diff-index which does not recognise merge-base revs. Fix this by using the hex of the found commit instead of the given name. Note that "HEAD" is handled specially in run_add_interactive() so it's explicitly not changed. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
118 lines
3.4 KiB
Bash
Executable file
118 lines
3.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git restore --patch'
|
|
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success PERL '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
|
|
'
|
|
|
|
test_expect_success PERL 'restore -p without pathspec is fine' '
|
|
echo q >cmd &&
|
|
git restore -p <cmd
|
|
'
|
|
|
|
# note: bar sorts before dir/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 head &&
|
|
test_write_lines n n | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_saved_state dir/foo
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p' '
|
|
set_and_save_state dir/foo work head &&
|
|
test_write_lines n y | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p with staged changes' '
|
|
set_state dir/foo work index &&
|
|
test_write_lines n y | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo index index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD^' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD^ &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD^...' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD^... &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p handles deletion' '
|
|
set_state dir/foo work index &&
|
|
rm dir/foo &&
|
|
test_write_lines n y | git restore -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 PERL 'path limiting works: dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git restore -p dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'path limiting works: -- dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git restore -p -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'path limiting works: HEAD^ -- 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 | git restore -p --source=HEAD^ -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent head
|
|
'
|
|
|
|
test_expect_success PERL '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 restore -p foo) &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
test_done
|