[PATCH 2/3] stash: accept options also when subcommand 'save' is omitted
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Aug 18, 2009, 21:38 UTC
- Message-ID
- <1250631523-10524-3-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <1250631523-10524-2-git-send-email-Matthieu.Moy@imag.fr>
This allows in particular 'git stash -k which is shorter than 'git stash save -k', and not ambiguous.
Testcase taken from Johannes Schindelin <johannes.schindelin@gmx.de>.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- Documentation/git-stash.txt | 2 +- git-stash.sh | 8 +++++++- t/t3903-stash.sh | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 1b5392a..7e515ce 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [--patch] [--[no-]keep-index|-k] [-q|--quiet] [<message>]] +'git stash' [save] [--patch] [--[no-]keep-index|-k] [-q|--quiet] [<message>] 'git stash' clear 'git stash' create diff --git a/git-stash.sh b/git-stash.sh index 856a2d5..bb36bc7 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -7,7 +7,7 @@ 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 [-k|--keep-index] [-q|--quiet] [<message>]] + or: $dashless [save] [-k|--keep-index] [-q|--quiet] [<message>] or: $dashless clear" SUBDIRECTORY_OK=Yes @@ -354,6 +354,12 @@ apply_to_branch () { drop_stash $stash } +case "$1" in + -*) + set "save" "$@" + ;; +esac + # Main command set case "$1" in list) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 7a3fb67..0e831e0 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -200,4 +200,12 @@ test_expect_success 'drop -q is quiet' ' test ! -s output.out ' +test_expect_success 'stash -k' ' + echo bar3 > file && + echo bar4 > file2 && + git add file2 && + git stash -k && + test bar,bar4 = $(cat file),$(cat file2) +' + test_done
-- 1.6.4.rc2.31.g2d7d7