X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-stash.sh;h=c2b68205a2b69eb91b2403e11238093fc65c04ef;hb=803d5158123346229d71de53818920efbc88ca0f;hp=534eb168abf8b0b8ae5c2195bf85b66d9cb6b21e;hpb=ffa06873d62bba358b51b43def2a0b3aefc790bf;p=git.git diff --git a/git-stash.sh b/git-stash.sh index 534eb168a..c2b68205a 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2007, Nanako Shiraishi -USAGE='[ | list | show | apply | clear]' +USAGE='[ | save | list | show | apply | clear | drop | pop | create ]' SUBDIRECTORY_OK=Yes OPTIONS_SPEC= @@ -15,11 +15,15 @@ trap 'rm -f "$TMP-*"' 0 ref_stash=refs/stash no_changes () { - git diff-index --quiet --cached HEAD && + git diff-index --quiet --cached HEAD -- && git diff-files --quiet } clear_stash () { + if test $# != 0 + then + die "git stash clear with parameters is unimplemented" + fi if current=$(git rev-parse --verify $ref_stash 2>/dev/null) then git update-ref -d $ref_stash $current @@ -37,7 +41,7 @@ create_stash () { # state of the base commit if b_commit=$(git rev-parse --verify HEAD) then - head=$(git log --abbrev-commit --pretty=oneline -n 1 HEAD) + head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --) else die "You do not have the initial commit yet" fi @@ -86,7 +90,7 @@ save_stash () { if no_changes then - echo >&2 'No local changes to save' + echo 'No local changes to save' exit 0 fi test -f "$GIT_DIR/logs/$ref_stash" || @@ -99,7 +103,7 @@ save_stash () { git update-ref -m "$stash_msg" $ref_stash $w_commit || die "Cannot save the current status" - printf >&2 'Saved "%s"\n' "$stash_msg" + printf 'Saved working directory and index state "%s"\n' "$stash_msg" } have_stash () { @@ -108,7 +112,7 @@ have_stash () { list_stash () { have_stash || return 0 - git log --pretty=oneline -g "$@" $ref_stash | + git log --no-color --pretty=oneline -g "$@" $ref_stash -- | sed -n -e 's/^[.0-9a-f]* refs\///p' } @@ -192,6 +196,28 @@ apply_stash () { fi } +drop_stash () { + have_stash || die 'No stash entries to drop' + + if test $# = 0 + then + set x "$ref_stash@{0}" + shift + fi + # Verify supplied argument looks like a stash entry + s=$(git rev-parse --revs-only --no-flags "$@") && + 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 --updateref --rewrite "$@" && + echo "Dropped $* ($s)" || die "$*: Could not drop stash entry" + + # clear_stash if we just dropped the last stash entry + git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash +} + # Main command set case "$1" in list) @@ -207,12 +233,17 @@ show) shift show_stash "$@" ;; +save) + shift + save_stash "$*" && git-reset --hard + ;; apply) shift apply_stash "$@" ;; clear) - clear_stash + shift + clear_stash "$@" ;; create) if test $# -gt 0 && test "$1" = create @@ -221,14 +252,26 @@ create) fi create_stash "$*" && echo "$w_commit" ;; -help | usage) - usage +drop) + shift + drop_stash "$@" + ;; +pop) + shift + if apply_stash "$@" + then + test -z "$unstash_index" || shift + drop_stash "$@" + fi ;; *) - if test $# -gt 0 && test "$1" = save + if test $# -eq 0 then - shift + save_stash && + echo '(To restore them type "git stash apply")' && + git-reset --hard + else + usage fi - save_stash "$*" && git-reset --hard ;; esac