summaryrefslogtreecommitdiff
path: root/git-legacy-stash.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-legacy-stash.sh')
-rwxr-xr-xgit-legacy-stash.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh
index 07ad4a5459..4d4ebb4f2b 100755
--- 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"
) ) ||
@@ -206,7 +207,7 @@ create_stash () {
# find out what the user wants
GIT_INDEX_FILE="$TMP-index" \
- git add--interactive --patch=stash -- "$@" &&
+ git add --legacy-stash-p -- "$@" &&
# state of the working tree
w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||