diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-21 21:57:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-22 00:06:21 (GMT) |
| commit | 90a6bb98d11a664f729dbb86c90d9c7a38ea825a (patch) | |
| tree | 48d3d5ce4f9499176010e327a84c26c1bfc3d9ff /git-legacy-stash.sh | |
| parent | 36bae1dc0ee777aa529dd955f2e619281265f262 (diff) | |
| download | git-90a6bb98d11a664f729dbb86c90d9c7a38ea825a.zip git-90a6bb98d11a664f729dbb86c90d9c7a38ea825a.tar.gz git-90a6bb98d11a664f729dbb86c90d9c7a38ea825a.tar.bz2 | |
legacy stash -p: respect the add.interactive.usebuiltin setting
As `git add` traditionally did not expose the `--patch=<mode>` modes via
command-line options, the scripted version of `git stash` had to call
`git add--interactive` directly.
But this prevents the built-in `add -p` from kicking in, as
`add--interactive` is the scripted version (which does not have a
"fall-back" to the built-in version).
So let's introduce support for internal switch for `git add` that the
scripted `git stash` can use to call the appropriate backend (scripted
or built-in, depending on `add.interactive.useBuiltin`).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-legacy-stash.sh')
| -rwxr-xr-x | git-legacy-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh index 07ad4a5..ed039df 100755 --- a/git-legacy-stash.sh +++ b/git-legacy-stash.sh @@ -206,7 +206,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) || |