Brandon CaseyThis allows a single stash entry to be deleted. It takes an optional argument which is a stash reflog entry. If no arguments are supplied, stash@{0} is used.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> ---
Thus far I haven't been a big user of git stash, but I plan to use it more and I expect to use 'drop' more often than 'clear'. I expect in the common case there will be a single stash, and 'drop' will be sufficient. For the case where there are many stashes and I want to remove one, 'drop' is required. 'git stash clear' will become a command that I give special attention to just like 'rm -f *'.
I'm not sure if there is a proper way to get 'stash@{0}' from 'refs/stash' so I kept my usage of that former string outside of the drop_stash() function.
Comments welcome, especially if there is a more appropriate way to do this.
-brandon
Documentation/git-stash.txt | 7 ++++++- git-stash.sh | 29 ++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-)
Show changes to 2 files +34 −2
Documentation/git-stash.txt, git-stash.sh
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index c0147b9..b89eadb 100644 --- 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] -'git-stash' (list | show [<stash>] | apply [<stash>] | clear) +'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>]) 'git-stash' [save] [message...] DESCRIPTION @@ -81,6 +81,11 @@ clear:: Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. +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}` + DISCUSSION ---------- diff --git a/git-stash.sh b/git-stash.sh index 06cb177..a789a53 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2007, Nanako Shiraishi -USAGE='[ | save | list | show | apply | clear | create ]' +USAGE='[ | save | list | show | apply | clear | create | drop ]' SUBDIRECTORY_OK=Yes OPTIONS_SPEC= @@ -192,6 +192,24 @@ apply_stash () { fi } +drop_stash () { + if ! have_stash + then + echo >&2 'No stash entries to drop' + exit 0 + fi + + # Verify supplied argument looks like a stash entry + s=$(git rev-parse --revs-only --no-flags --default $ref_stash "$@") && + git rev-parse --verify "$s:" > /dev/null 2>&1 && + git rev-parse --verify "$s^1:" > /dev/null 2>&1 && + git rev-parse --verify "$s^2:" > /dev/null 2>&1 || + die "$*: not a valid stashed state" + + git reflog delete "$@" && echo "Dropped $@ ($s)" || + die "$*: Could not drop stash entry" +} + # Main command set case "$1" in list) @@ -225,6 +243,15 @@ create) fi create_stash "$*" && echo "$w_commit" ;; +drop) + shift + if test $# = 0 + then + set -- "stash@{0}" + fi + drop_stash "$@" && + (git rev-parse --verify "stash@{0}" > /dev/null 2>&1 || clear_stash) + ;; *) if test $# -eq 0 then
-- 1.5.4.rc2.1119.g6fdf-dirty
