git-stash: add new 'pop' subcommand

This combines the existing stash subcommands 'apply' and 'drop' to
allow a single stash entry to be applied and then dropped, in other
words 'popped', from the stash list.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index f50c24ce9aa1c1d2937f3eb8ee27b349a6f0a3ba..8dc35d493e81bc0c5515ec279dbe95c464c57469 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -8,7 +8,7 @@ git-stash - Stash the changes in a dirty working directory away
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>])
+'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>] | pop [<stash>])

 'git-stash' [save [<message>]]
 
 DESCRIPTION
 'git-stash' [save [<message>]]
 
 DESCRIPTION


@@ -90,6 +90,12 @@ drop [<stash>]::
        Remove a single stashed state from the stash list. When no `<stash>`
        is given, it removes the latest one. i.e. `stash@\{0}`
 
        Remove a single stashed state from the stash list. When no `<stash>`
        is given, it removes the latest one. i.e. `stash@\{0}`
 

+pop [<stash>]::
+
+       Remove a single stashed state from the stash list and apply on top
+       of the current working tree state. When no `<stash>` is given,
+       `stash@\{0}` is assumed. See also `apply`.
+

 
 DISCUSSION
 ----------
 
 DISCUSSION
 ----------

diff --git a/git-stash.sh b/git-stash.sh
index 5e3eb56791463e8aa10a6b8683411a5c231f1274..c2b68205a2b69eb91b2403e11238093fc65c04ef 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 

-USAGE='[  | save | list | show | apply | clear | drop | create ]'
+USAGE='[  | save | list | show | apply | clear | drop | pop | create ]'

 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=


@@ -256,6 +256,14 @@ drop)
        shift
        drop_stash "$@"
        ;;
        shift
        drop_stash "$@"
        ;;

+pop)
+       shift
+       if apply_stash "$@"
+       then
+               test -z "$unstash_index" || shift
+               drop_stash "$@"
+       fi
+       ;;

 *)
        if test $# -eq 0
        then
 *)
        if test $# -eq 0
        then