diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-02-26 00:16:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:41:40 +0100 |
| commit | 90a462725ef3932a2408e78a47e3dfc1b8d445cf (patch) | |
| tree | a6126954c52363bc9eaefebd5fc1f1a425abfe40 /Makefile | |
| parent | stash: add back the original, scripted `git stash` (diff) | |
| download | git-90a462725ef3932a2408e78a47e3dfc1b8d445cf.tar.xz git-90a462725ef3932a2408e78a47e3dfc1b8d445cf.zip | |
stash: optionally use the scripted version again
We recently converted the `git stash` command from Unix shell scripts
to builtins.
Let's end users a way out when they discover a bug in the
builtin command: `stash.useBuiltin`.
As the file name `git-stash` is already in use, let's rename the
scripted backend to `git-legacy-stash`.
To make the test suite pass with `stash.useBuiltin=false`, this commit
also backports rudimentary support for `-q` (but only *just* enough
to appease the test suite), and adds a super-ugly hack to force exit
code 129 for `git stash -h`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -617,6 +617,7 @@ SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-quiltimport.sh SCRIPT_SH += git-legacy-rebase.sh +SCRIPT_SH += git-legacy-stash.sh SCRIPT_SH += git-remote-testgit.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-submodule.sh |