From: Charles Bailey <charles@hashpling•org>
To: git@vger•kernel.org, khellls@gmail•com
Cc: Charles Bailey <charles@hashpling•org>
Subject: [PATCH 2/2] stash: Don't overwrite files that have gone from the index
Date: Sat, 10 Apr 2010 19:14:01 +0100 [thread overview]
Message-ID: <1270923241-14383-2-git-send-email-charles@hashpling.org> (raw)
In-Reply-To: <v2w918f64e01004101104xd4f1b4eciec01d2e87691ee72@mail.gmail.com>
---
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
prev parent reply other threads:[~2010-04-10 18:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-10 18:04 Strange case with stash Khaled al Habache
2010-04-10 18:14 ` [PATCH 1/2] stash bug: stash can lose data in a file removed from the index Charles Bailey
2010-04-12 21:44 ` Charles Bailey
2010-04-10 18:14 ` Charles Bailey [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270923241-14383-2-git-send-email-charles@hashpling.org \
--to=charles@hashpling$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=khellls@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox