undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: use stash_push for no verb form

Browse Source 
Now that we have stash_push, which accepts pathspec arguments, use
it instead of stash_save in git stash without any additional verbs.

Previously we allowed git stash -- -message, which is no longer allowed
after this patch.  Messages starting with a hyphen was allowed since
3c2eb80f, ("stash: simplify defaulting to "save" and reject unknown
options").  However it was never the intent to allow that, but rather it
was allowed accidentally.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer 2017-02-28 20:33:39 +00:00 committed by Junio C Hamano
parent df6bba0937
commit 1ada5020b3
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-stash.txt
View File

@ -13,11 +13,11 @@ SYNOPSIS
'git stash' drop [-q|--quiet] [<stash>] 'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>] 'git stash' branch <branchname> [<stash>]
'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] 'git stash' save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [<message>]] [-u|--include-untracked] [-a|--all] [<message>]
'git stash' push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] 'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m|--message <message>]] [-u|--include-untracked] [-a|--all] [-m|--message <message>]]
[--] [<pathspec>...] [--] [<pathspec>...]]
'git stash' clear 'git stash' clear
'git stash' create [<message>] 'git stash' create [<message>]
'git stash' store [-m|--message <message>] [-q|--quiet] <commit> 'git stash' store [-m|--message <message>] [-q|--quiet] <commit>

16
git-stash.sh
View File

@ -7,11 +7,11 @@ USAGE="list [<options>]
or: $dashless drop [-q|--quiet] [<stash>] or: $dashless drop [-q|--quiet] [<stash>]
or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>] or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
or: $dashless branch <branchname> [<stash>] or: $dashless branch <branchname> [<stash>]
or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] or: $dashless save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [<message>]] [-u|--include-untracked] [-a|--all] [<message>]
or: $dashless push [--patch] [-k|--[no-]keep-index] [-q|--quiet] or: $dashless [push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m <message>] [-u|--include-untracked] [-a|--all] [-m <message>]
[-- <pathspec>...] [-- <pathspec>...]]
or: $dashless clear" or: $dashless clear"
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
@ -657,7 +657,7 @@ apply_to_branch () {
} }
PARSE_CACHE='--not-parsed' PARSE_CACHE='--not-parsed'
# The default command is "save" if nothing but options are given # The default command is "push" if nothing but options are given
seen_non_option= seen_non_option=
for opt for opt
do do
@ -667,7 +667,7 @@ do
esac esac
done done
test -n "$seen_non_option" || set "save" "$@" test -n "$seen_non_option" || set "push" "$@"
# Main command set # Main command set
case "$1" in case "$1" in
@ -718,7 +718,7 @@ branch)
*) *)
case $# in case $# in
0) 0)
save_stash && push_stash &&
say "$(gettext "(To restore them type \"git stash apply\")")" say "$(gettext "(To restore them type \"git stash apply\")")"
;; ;;
*) *)

4
t/t3903-stash.sh
View File

@ -274,9 +274,7 @@ test_expect_success 'stash --invalid-option' '
git add file2 && git add file2 &&
test_must_fail git stash --invalid-option && test_must_fail git stash --invalid-option &&
test_must_fail git stash save --invalid-option && test_must_fail git stash save --invalid-option &&
test bar5,bar6 = $(cat file),$(cat file2) && test bar5,bar6 = $(cat file),$(cat file2)
git stash -- -message-starting-with-dash &&
test bar,bar2 = $(cat file),$(cat file2)
' '
test_expect_success 'stash an added file' ' test_expect_success 'stash an added file' '