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 07ad4a545910da5ff5a591c159da292d5101dec3..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"
                ) ) ||