mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
stash: use stash_push for no verb form
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:
parent
df6bba0937
commit
1ada5020b3
|
@ -13,11 +13,11 @@ SYNOPSIS
|
|||
'git stash' drop [-q|--quiet] [<stash>]
|
||||
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
|
||||
'git stash' branch <branchname> [<stash>]
|
||||
'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [<message>]]
|
||||
'git stash' push [-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>]
|
||||
'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [-m|--message <message>]]
|
||||
[--] [<pathspec>...]
|
||||
[--] [<pathspec>...]]
|
||||
'git stash' clear
|
||||
'git stash' create [<message>]
|
||||
'git stash' store [-m|--message <message>] [-q|--quiet] <commit>
|
||||
|
|
16
git-stash.sh
16
git-stash.sh
|
@ -7,11 +7,11 @@ USAGE="list [<options>]
|
|||
or: $dashless drop [-q|--quiet] [<stash>]
|
||||
or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
|
||||
or: $dashless branch <branchname> [<stash>]
|
||||
or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [<message>]]
|
||||
or: $dashless push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [-m <message>]
|
||||
[-- <pathspec>...]
|
||||
or: $dashless save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [<message>]
|
||||
or: $dashless [push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
|
||||
[-u|--include-untracked] [-a|--all] [-m <message>]
|
||||
[-- <pathspec>...]]
|
||||
or: $dashless clear"
|
||||
|
||||
SUBDIRECTORY_OK=Yes
|
||||
|
@ -657,7 +657,7 @@ apply_to_branch () {
|
|||
}
|
||||
|
||||
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=
|
||||
for opt
|
||||
do
|
||||
|
@ -667,7 +667,7 @@ do
|
|||
esac
|
||||
done
|
||||
|
||||
test -n "$seen_non_option" || set "save" "$@"
|
||||
test -n "$seen_non_option" || set "push" "$@"
|
||||
|
||||
# Main command set
|
||||
case "$1" in
|
||||
|
@ -718,7 +718,7 @@ branch)
|
|||
*)
|
||||
case $# in
|
||||
0)
|
||||
save_stash &&
|
||||
push_stash &&
|
||||
say "$(gettext "(To restore them type \"git stash apply\")")"
|
||||
;;
|
||||
*)
|
||||
|
|
|
@ -274,9 +274,7 @@ test_expect_success 'stash --invalid-option' '
|
|||
git add file2 &&
|
||||
test_must_fail git stash --invalid-option &&
|
||||
test_must_fail git stash save --invalid-option &&
|
||||
test bar5,bar6 = $(cat file),$(cat file2) &&
|
||||
git stash -- -message-starting-with-dash &&
|
||||
test bar,bar2 = $(cat file),$(cat file2)
|
||||
test bar5,bar6 = $(cat file),$(cat file2)
|
||||
'
|
||||
|
||||
test_expect_success 'stash an added file' '
|
||||
|
|
Loading…
Reference in a new issue