From: Vasily Titskiy <qehgt0@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Ignore dirty submodule states during stash
Date: Mon, 16 May 2016 02:07:35 +0000 [thread overview]
Message-ID: <20160516020735.GA7884@gmail.com> (raw)
Do not save states of submodules as stash should ignore it.
Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>
---
git-stash.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-stash.sh b/git-stash.sh
index c7c65e2..b500c44 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -116,7 +116,7 @@ create_stash () {
git read-tree --index-output="$TMPindex" -m $i_tree &&
GIT_INDEX_FILE="$TMPindex" &&
export GIT_INDEX_FILE &&
- git diff --name-only -z HEAD -- >"$TMP-stagenames" &&
+ git diff --name-only --ignore-submodules -z HEAD -- >"$TMP-stagenames" &&
git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
git write-tree &&
rm -f "$TMPindex"
--
2.1.4
next reply other threads:[~2016-05-16 2:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-16 2:07 Vasily Titskiy [this message]
2016-05-16 6:37 ` [PATCH] Ignore dirty submodule states during stash Stefan Beller
2016-05-16 15:46 ` Vasily Titskiy
2016-05-16 16:09 ` Stefan Beller
2016-05-17 3:17 ` Vasily Titskiy
2016-05-16 16:29 ` Johannes Schindelin
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=20160516020735.GA7884@gmail.com \
--to=qehgt0@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).