From: Charles Bailey Date: Sat, 10 Apr 2010 18:14:01 GMT Subject: [PATCH 2/2] stash: Don't overwrite files that have gone from the index Message-ID: <1270923241-14383-2-git-send-email-charles@hashpling.org> In-Reply-To: --- This patch is deliberately not signed off. It feels kludgy and uses a non-portable xargs invocation. It is designed as a starting point for discussion, that is all. git-stash.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 908aab2..9efc544 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -87,6 +87,8 @@ create_stash () { export GIT_INDEX_FILE && git read-tree -m $i_tree && git add -u && + { git diff --quiet --diff-filter=D --cached || + git diff -z --name-only --diff-filter=D --cached | xargs -0 git add --ignore-errors; } && git write-tree && rm -f "$TMP-index" ) ) || -- 1.7.1.rc0.266.gf3d756