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.
Junio C Hamano committed
Dec 7, 2008 at 17:30 UTC
0e32126f04f6ad64826d4c145f2a1a9685e0910d
1 file changed
+6
-6
git-stash.sh
+6
-6
@@ -30,7 +30,7 @@ clear_stash () {
30
then
31
die "git stash clear with parameters is unimplemented"
32
fi
33
- if current=$(git rev-parse -q --verify $ref_stash)
33
+ if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
34
then
35
git update-ref -d $ref_stash $current
36
fi
@@ -129,7 +129,7 @@ save_stash () {
129
}
130
131
have_stash () {
132
- git rev-parse -q --verify $ref_stash >/dev/null
132
+ git rev-parse --verify $ref_stash >/dev/null 2>&1
133
}
134
135
list_stash () {
@@ -229,16 +229,16 @@ drop_stash () {
229
fi
230
# Verify supplied argument looks like a stash entry
231
s=$(git rev-parse --verify "$@") &&
232
- git rev-parse -q --verify "$s:" > /dev/null &&
233
- git rev-parse -q --verify "$s^1:" > /dev/null &&
234
- git rev-parse -q --verify "$s^2:" > /dev/null ||
232
+ git rev-parse --verify "$s:" > /dev/null 2>&1 &&
233
+ git rev-parse --verify "$s^1:" > /dev/null 2>&1 &&
234
+ git rev-parse --verify "$s^2:" > /dev/null 2>&1 ||
235
die "$*: not a valid stashed state"
236
237
git reflog delete --updateref --rewrite "$@" &&
238
echo "Dropped $* ($s)" || die "$*: Could not drop stash entry"
239
240
# clear_stash if we just dropped the last stash entry
241
- git rev-parse -q --verify "$ref_stash@{0}" > /dev/null || clear_stash
241
+ git rev-parse --verify "$ref_stash@{0}" > /dev/null 2>&1 || clear_stash
242
}
243
244
apply_to_branch () {