{"thread":{"id":"20248","subject":"[PATCH] Make 'git stash -k' a short form for 'git stash save --keep-index'","startedAt":"2009-07-27T18:37:10Z","lastAt":"2009-07-27T21:37:28Z","messageCount":4,"participants":["Johannes Schindelin","Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"118892","messageId":"76cdda0d6cf911449d16ebb86f54641620135fca.1248719786u.git.johannes.schindelin@gmx.de","threadId":"20248","inReplyTo":"cover.1248719786u.git.johannes.schindelin@gmx.de","subject":"[PATCH] Make 'git stash -k' a short form for 'git stash save --keep-index'","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-27T18:37:10Z","receivedAt":"2009-07-27T18:37:10Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"To save me from the carpal tunnel syndrome, make 'git stash' accept\nthe short option '-k' instead of '--keep-index', and for even more\nconvenience, let's DWIM when this developer forgot to type the 'save'\ncommand.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/git-stash.txt | 3 ++-\n git-stash.sh | 16 +++++++++-------\n t/t3903-stash.sh | 8 ++++++++\n 3 files changed, 19 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex 1c64a02..a031836 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -13,7 +13,8 @@ SYNOPSIS\n 'git stash' drop [-q|--quiet] []\n 'git stash' ( pop | apply ) [--index] [-q|--quiet] []\n 'git stash' branch []\n-'git stash' [save [--keep-index] [-q|--quiet] []]\n+'git stash' [save [-k|--keep-index] [-q|--quiet] []]\n+'git stash' [-k|--keep-index]\n 'git stash' clear\n 'git stash' create\n \ndiff --git a/git-stash.sh b/git-stash.sh\nindex 03e589f..13edc0e 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -7,7 +7,8 @@ USAGE=\"list []\n or: $dashless drop [-q|--quiet] []\n or: $dashless ( pop | apply ) [--index] [-q|--quiet] []\n or: $dashless branch []\n- or: $dashless [save [--keep-index] [-q|--quiet] []]\n+ or: $dashless [save [-k|--keep-index] [-q|--quiet] []]\n+ or: $dashless [-k|--keep-index]\n or: $dashless clear\"\n \n SUBDIRECTORY_OK=Yes\n@@ -98,7 +99,7 @@ save_stash () {\n \twhile test $# != 0\n \tdo\n \t\tcase \"$1\" in\n-\t\t--keep-index)\n+\t\t-k|--keep-index)\n \t\t\tkeep_index=t\n \t\t\t;;\n \t\t-q|--quiet)\n@@ -353,12 +354,13 @@ branch)\n \tapply_to_branch \"$@\"\n \t;;\n *)\n-\tif test $# -eq 0\n-\tthen\n-\t\tsave_stash &&\n+\tcase $#,\"$1\" in\n+\t0,|1,-k|1,--keep-index)\n+\t\tsave_stash \"$@\" &&\n \t\tsay '(To restore them type \"git stash apply\")'\n-\telse\n+\t\t;;\n+\t*)\n \t\tusage\n-\tfi\n+\tesac\n \t;;\n esac\ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 7a3fb67..e16ad93 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -200,4 +200,12 @@ test_expect_success 'drop -q is quiet' '\n \ttest ! -s output.out\n '\n \n+test_expect_success 'stash -k' '\n+\techo bar3 > file &&\n+\techo bar4 > file2 &&\n+\tgit add file2 &&\n+\tgit stash -k &&\n+\ttest bar,bar4 = $(cat file),$(cat file2)\n+'\n+\n test_done\n-- \n1.6.3.2.734.g770e\n"},{"id":"118907","messageId":"fabb9a1e0907271424x5495a228r779efe9794848880@mail.gmail.com","threadId":"20248","inReplyTo":"76cdda0d6cf911449d16ebb86f54641620135fca.1248719786u.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] Make 'git stash -k' a short form for 'git stash save --keep-index'","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-07-27T21:24:18Z","receivedAt":"2009-07-27T21:24:18Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Jul 27, 2009 at 11:37, Johannes\nSchindelin wrote:\n> To save me from the carpal tunnel syndrome, make 'git stash' accept\n> the short option '-k' instead of '--keep-index', and for even more\n> convenience, let's DWIM when this developer forgot to type the 'save'\n> command.\n\n+many, especially the DWIM part! Does it also grok 'git stash --keep-index'?\n\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"118909","messageId":"alpine.DEB.1.00.0907272336290.8306@pacific.mpi-cbg.de","threadId":"20248","inReplyTo":"fabb9a1e0907271424x5495a228r779efe9794848880@mail.gmail.com","subject":"Re: [PATCH] Make 'git stash -k' a short form for 'git stash save --keep-index'","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-27T21:37:02Z","receivedAt":"2009-07-27T21:37:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 27 Jul 2009, Sverre Rabbelier wrote:\n\n> On Mon, Jul 27, 2009 at 11:37, Johannes \n> Schindelin wrote:\n> > To save me from the carpal tunnel syndrome, make 'git stash' accept \n> > the short option '-k' instead of '--keep-index', and for even more \n> > convenience, let's DWIM when this developer forgot to type the 'save' \n> > command.\n> \n> +many, especially the DWIM part! Does it also grok 'git stash \n> --keep-index'?\n\nYes, it does, but it causes carpal tunnel.\n\nCiao,\nDscho\n"},{"id":"118910","messageId":"fabb9a1e0907271437x7ff04c0ao225b23a1363e265c@mail.gmail.com","threadId":"20248","inReplyTo":"alpine.DEB.1.00.0907272336290.8306@pacific.mpi-cbg.de","subject":"Re: [PATCH] Make 'git stash -k' a short form for 'git stash save --keep-index'","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-07-27T21:37:28Z","receivedAt":"2009-07-27T21:37:28Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Jul 27, 2009 at 14:37, Johannes\nSchindelin wrote:\n> Yes, it does, but it causes carpal tunnel.\n\nTrue that, but it's consistent at least :).\n\n-- \nCheers,\n\nSverre Rabbelier\n"}]}