Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / git-legacy-stash.sh

diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh
index f60e9b3e877b24e42431654e1de19911bdfc4f25..53fa5743018f19d8428f4a24379907bcbb6d80bf 100755 (executable)
--- a/git-legacy-stash.sh
+++ b/git-legacy-stash.sh
@@ -193,7 +193,8 @@ create_stash () {
                        GIT_INDEX_FILE="$TMPindex" &&
                        export GIT_INDEX_FILE &&
                        git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" &&
-                       git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
+                       git update-index --ignore-skip-worktree-entries \
+                               -z --add --remove --stdin <"$TMP-stagenames" &&
                        git write-tree &&
                        rm -f "$TMPindex"
                ) ) ||
@@ -370,7 +371,7 @@ push_stash () {
                        git diff-index -p --cached --binary HEAD -- "$@" |
                        git apply --index -R
                else
-                       git reset --hard -q
+                       git reset --hard -q --no-recurse-submodules
                fi
 
                if test "$keep_index" = "t" && test -n "$i_tree"