summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2010-04-18 18:28:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-18 22:00:03 (GMT)
commit7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec (patch)
tree9f764508a8311e7ee4bfa6848169da3047aea8c4
parent53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (diff)
downloadgit-7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec.zip
git-7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec.tar.gz
git-7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec.tar.bz2
stash: Don't overwrite files that have gone from the index
The use of git add -u in create_stash isn't always complete. In particular, if a file has been removed from the index but changed in the work tree it will not be added to the stash's saved work tree tree object. When stash then resets the work tree to match HEAD, any changes will be lost. To be complete, any work tree file which differs from HEAD needs to be saved, regardless of whether it still appears in the index or not. This is achieved with a combination of a diff against HEAD and a call to update-index with an explicit list of paths that have changed. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-stash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 59db3dc..0f858d3 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -86,7 +86,7 @@ create_stash () {
GIT_INDEX_FILE="$TMP-index" &&
export GIT_INDEX_FILE &&
git read-tree -m $i_tree &&
- git add -u &&
+ git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
git write-tree &&
rm -f "$TMP-index"
) ) ||