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 /builtin/fmt-merge-msg.c | |
parent | Update draft release notes to 1.7.9 (diff) | |
download | tgif-44df2e297025d7a9af6c265dfefb687b09e2537a.tar.xz |
stash: Don't fail if work dir contains file named 'HEAD'
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 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions