about summary refs log tree commit diff
path: root/third_party/git/git-legacy-stash.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/git-legacy-stash.sh')
-rwxr-xr-xthird_party/git/git-legacy-stash.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/git/git-legacy-stash.sh b/third_party/git/git-legacy-stash.sh
index 4d4ebb4f2ba5..f60e9b3e877b 100755
--- a/third_party/git/git-legacy-stash.sh
+++ b/third_party/git/git-legacy-stash.sh
@@ -193,8 +193,7 @@ create_stash () {
 			GIT_INDEX_FILE="$TMPindex" &&
 			export GIT_INDEX_FILE &&
 			git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" &&
-			git update-index --ignore-skip-worktree-entries \
-				-z --add --remove --stdin <"$TMP-stagenames" &&
+			git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
 			git write-tree &&
 			rm -f "$TMPindex"
 		) ) ||
@@ -207,7 +206,7 @@ create_stash () {
 
 		# find out what the user wants
 		GIT_INDEX_FILE="$TMP-index" \
-			git add --legacy-stash-p -- "$@" &&
+			git add--interactive --patch=stash -- "$@" &&
 
 		# state of the working tree
 		w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
@@ -371,7 +370,7 @@ push_stash () {
 			git diff-index -p --cached --binary HEAD -- "$@" |
 			git apply --index -R
 		else
-			git reset --hard -q --no-recurse-submodules
+			git reset --hard -q
 		fi
 
 		if test "$keep_index" = "t" && test -n "$i_tree"