[PATCH 2/2] (resend) stash: Don't overwrite files that have gone from the index

From: Charles Bailey <charles@hashpling.org>
Date: Apr 15, 2010, 00:24 UTC
Message-ID: <1271291062-32154-2-git-send-email-charles@hashpling.org>
In-Reply-To: <1271291062-32154-1-git-send-email-charles@hashpling.org>

---

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.rc1.241.g4e72f