stash: prefer --quiet over shell redirection of the standard error stream
Use `git rev-parse --verify --quiet` instead of redirecting stderr to /dev/null. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Sep 15, 2014 at 20:24 UTC
1956dfa818e376c5d62adc16d77f5b5cacf923f8
1 file changed
+7
-6
git-stash.sh
+7
-6
@@ -50,7 +50,7 @@ clear_stash () {
50
then
51
die "$(gettext "git stash clear with parameters is unimplemented")"
52
fi
53
- if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
53
+ if current=$(git rev-parse --verify --quiet $ref_stash)
54
then
55
git update-ref -d $ref_stash $current
56
fi
@@ -292,7 +292,7 @@ save_stash () {
292
}
293
294
have_stash () {
295
- git rev-parse --verify $ref_stash >/dev/null 2>&1
295
+ git rev-parse --verify --quiet $ref_stash >/dev/null
296
}
297
298
list_stash () {
@@ -392,12 +392,12 @@ parse_flags_and_rev()
392
;;
393
esac
394
395
- REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
395
+ REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
396
reference="$1"
397
die "$(eval_gettext "\$reference is not valid reference")"
398
}
399
400
- i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&
400
+ i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
401
set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
402
s=$1 &&
403
w_commit=$1 &&
@@ -409,7 +409,7 @@ parse_flags_and_rev()
409
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
410
IS_STASH_REF=t
411
412
- u_commit=$(git rev-parse --quiet --verify "$REV^3" 2>/dev/null) &&
412
+ u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
413
u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
414
}
415
@@ -531,7 +531,8 @@ drop_stash () {
531
die "$(eval_gettext "\${REV}: Could not drop stash entry")"
532
533
# clear_stash if we just dropped the last stash entry
534
- git rev-parse --verify "$ref_stash@{0}" >/dev/null 2>&1 || clear_stash
534
+ git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
535
+ clear_stash
536
}
537
538
apply_to_branch () {