kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Revert "git-stash: use git rev-parse -q" 

This reverts commit 757c7f60a7 as an
unnecessary error message to pop up when the last stash entry is dropped.

It simply is not worth the aggravation.
maint
Junio C Hamano 2008-12-07 17:30:35 -08:00
parent 0516cc5cc6
commit 0e32126f04
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-stash.sh
View File

@ -30,7 +30,7 @@ clear_stash () {
then then
die "git stash clear with parameters is unimplemented" die "git stash clear with parameters is unimplemented"
fi fi
if current=$(git rev-parse -q --verify $ref_stash) if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
then then
git update-ref -d $ref_stash $current git update-ref -d $ref_stash $current
fi fi
@ -129,7 +129,7 @@ save_stash () {
} }


have_stash () { have_stash () {
git rev-parse -q --verify $ref_stash >/dev/null git rev-parse --verify $ref_stash >/dev/null 2>&1
} }


list_stash () { list_stash () {
@ -229,16 +229,16 @@ drop_stash () {
fi fi
# Verify supplied argument looks like a stash entry # Verify supplied argument looks like a stash entry
s=$(git rev-parse --verify "$@") && s=$(git rev-parse --verify "$@") &&
git rev-parse -q --verify "$s:" > /dev/null && git rev-parse --verify "$s:" > /dev/null 2>&1 &&
git rev-parse -q --verify "$s^1:" > /dev/null && git rev-parse --verify "$s^1:" > /dev/null 2>&1 &&
git rev-parse -q --verify "$s^2:" > /dev/null || git rev-parse --verify "$s^2:" > /dev/null 2>&1 ||
die "$*: not a valid stashed state" die "$*: not a valid stashed state"


git reflog delete --updateref --rewrite "$@" && git reflog delete --updateref --rewrite "$@" &&
echo "Dropped $* ($s)" || die "$*: Could not drop stash entry" echo "Dropped $* ($s)" || die "$*: Could not drop stash entry"


# clear_stash if we just dropped the last stash entry # clear_stash if we just dropped the last stash entry
git rev-parse -q --verify "$ref_stash@{0}" > /dev/null || clear_stash git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
} }


apply_to_branch () { apply_to_branch () {