mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
44df2e2970
When performing a plain "git stash" (without --patch), git-diff would fail with "fatal: ambiguous argument 'HEAD': both revision and filename". The output was piped into git-update-index, masking the failed exit status. The output is now sent to a temporary file (which is cleaned up by existing code), and the exit status is checked. The "HEAD" arg to the git-diff invocation has been disambiguated too, of course. In patch mode, "git stash -p" would fail harmlessly, leaving the working dir untouched. Interactive adding is fine, but the resulting tree was diffed with an ambiguous 'HEAD' argument. Use >foo (no space) when redirecting output. In t3904, checks and operations on each file are in the order they'll appear when interactively staging. In t3905, fix a bug in "stash save --include-untracked -q is quiet": The redirected stdout file was considered untracked, and so was removed from the working directory. Use test path helper functions where appropriate. Signed-off-by: Jonathon Mah <me@JonathonMah.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
78 lines
2.2 KiB
Bash
Executable file
78 lines
2.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git checkout --patch'
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success PERL 'setup' '
|
|
mkdir dir &&
|
|
echo parent > dir/foo &&
|
|
echo dummy > bar &&
|
|
echo committed > HEAD &&
|
|
git add bar dir/foo HEAD &&
|
|
git commit -m initial &&
|
|
test_tick &&
|
|
test_commit second dir/foo head &&
|
|
echo index > dir/foo &&
|
|
git add dir/foo &&
|
|
set_and_save_state bar bar_work bar_index &&
|
|
save_head
|
|
'
|
|
|
|
# note: order of files with unstaged changes: HEAD bar dir/foo
|
|
|
|
test_expect_success PERL 'saying "n" does nothing' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state dir/foo work index &&
|
|
(echo n; echo n; echo n) | test_must_fail git stash save -p &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success PERL 'git stash -p' '
|
|
(echo y; echo n; echo y) | git stash save -p &&
|
|
verify_state HEAD committed HEADfile_index &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head index &&
|
|
git reset --hard &&
|
|
git stash apply &&
|
|
verify_state HEAD HEADfile_work committed &&
|
|
verify_state bar dummy dummy &&
|
|
verify_state dir/foo work head
|
|
'
|
|
|
|
test_expect_success PERL 'git stash -p --no-keep-index' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state bar bar_work bar_index &&
|
|
set_state dir/foo work index &&
|
|
(echo y; echo n; echo y) | git stash save -p --no-keep-index &&
|
|
verify_state HEAD committed committed &&
|
|
verify_state bar bar_work dummy &&
|
|
verify_state dir/foo head head &&
|
|
git reset --hard &&
|
|
git stash apply --index &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_state bar dummy bar_index &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success PERL 'git stash --no-keep-index -p' '
|
|
set_state HEAD HEADfile_work HEADfile_index &&
|
|
set_state bar bar_work bar_index &&
|
|
set_state dir/foo work index &&
|
|
(echo y; echo n; echo y) | git stash save --no-keep-index -p &&
|
|
verify_state HEAD committed committed &&
|
|
verify_state dir/foo head head &&
|
|
verify_state bar bar_work dummy &&
|
|
git reset --hard &&
|
|
git stash apply --index &&
|
|
verify_state HEAD HEADfile_work HEADfile_index &&
|
|
verify_state bar dummy bar_index &&
|
|
verify_state dir/foo work index
|
|
'
|
|
|
|
test_expect_success PERL 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
test_done
|