summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-08 01:30:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-08 01:30:35 (GMT)
commit0e32126f04f6ad64826d4c145f2a1a9685e0910d (patch)
treef060a758c94dd6950c9cf5fc60272fdc6ac774ff
parent0516cc5cc6ccb3b998ea5613ab178407c31339e3 (diff)
downloadgit-0e32126f04f6ad64826d4c145f2a1a9685e0910d.zip
git-0e32126f04f6ad64826d4c145f2a1a9685e0910d.tar.gz
git-0e32126f04f6ad64826d4c145f2a1a9685e0910d.tar.bz2
Revert "git-stash: use git rev-parse -q"
This reverts commit 757c7f60a78004fc3d0ea62f44320d54ef430c10 as an unnecessary error message to pop up when the last stash entry is dropped. It simply is not worth the aggravation.
-rwxr-xr-xgit-stash.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-stash.sh b/git-stash.sh
index c0532e8..b9ace99 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -30,7 +30,7 @@ clear_stash () {
then
die "git stash clear with parameters is unimplemented"
fi
- if current=$(git rev-parse -q --verify $ref_stash)
+ if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
then
git update-ref -d $ref_stash $current
fi
@@ -129,7 +129,7 @@ save_stash () {
}
have_stash () {
- git rev-parse -q --verify $ref_stash >/dev/null
+ git rev-parse --verify $ref_stash >/dev/null 2>&1
}
list_stash () {
@@ -229,16 +229,16 @@ drop_stash () {
fi
# Verify supplied argument looks like a stash entry
s=$(git rev-parse --verify "$@") &&
- git rev-parse -q --verify "$s:" > /dev/null &&
- git rev-parse -q --verify "$s^1:" > /dev/null &&
- git rev-parse -q --verify "$s^2:" > /dev/null ||
+ 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 -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 () {