Re: [PATCH v1 1/2] Ignore dirty submodule states during stash
flat view
From: Vasily Titskiy <hidden>
Date: 2016-06-16 02:19:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
As stash does not know how to deal with submodules, it should not try to save/restore their states as it leads to redundant merge conflicts. Signed-off-by: Vasily Titskiy <redacted> --- 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