diff options
| author | Jonathon Mah <me@JonathonMah.com> | 2011-12-30 16:14:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-01 01:11:56 -0800 |
| commit | 44df2e297025d7a9af6c265dfefb687b09e2537a (patch) | |
| tree | 3249d6f12743491be81d70a9253986f6529dce7e /t/t3903-stash.sh | |
| parent | 17b4e93d5b849293e6a3659bbc4075ed8a6e97e2 (diff) | |
| download | git-44df2e297025d7a9af6c265dfefb687b09e2537a.tar.gz | |
stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguate
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>
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index fcdb18217a..dbe2ac179d 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -601,4 +601,28 @@ test_expect_success 'stash apply shows status same as git status (relative to cu test_cmp expect actual ' +cat > expect << EOF +diff --git a/HEAD b/HEAD +new file mode 100644 +index 0000000..fe0cbee +--- /dev/null ++++ b/HEAD +@@ -0,0 +1 @@ ++file-not-a-ref +EOF + +test_expect_success 'stash where working directory contains "HEAD" file' ' + git stash clear && + git reset --hard && + echo file-not-a-ref > HEAD && + git add HEAD && + test_tick && + git stash && + git diff-files --quiet && + git diff-index --cached --quiet HEAD && + test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" && + git diff stash^..stash > output && + test_cmp output expect +' + test_done |