Skip to content

Commit 1956dfa

Browse files
davvidgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c41a87d commit 1956dfa

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

git-stash.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ clear_stash () {
5050
then
5151
die "$(gettext "git stash clear with parameters is unimplemented")"
5252
fi
53-
if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
53+
if current=$(git rev-parse --verify --quiet $ref_stash)
5454
then
5555
git update-ref -d $ref_stash $current
5656
fi
@@ -292,7 +292,7 @@ save_stash () {
292292
}
293293

294294
have_stash () {
295-
git rev-parse --verify $ref_stash >/dev/null 2>&1
295+
git rev-parse --verify --quiet $ref_stash >/dev/null
296296
}
297297

298298
list_stash () {
@@ -392,12 +392,12 @@ parse_flags_and_rev()
392392
;;
393393
esac
394394

395-
REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
395+
REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
396396
reference="$1"
397397
die "$(eval_gettext "\$reference is not valid reference")"
398398
}
399399

400-
i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&
400+
i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
401401
set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
402402
s=$1 &&
403403
w_commit=$1 &&
@@ -409,7 +409,7 @@ parse_flags_and_rev()
409409
test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
410410
IS_STASH_REF=t
411411

412-
u_commit=$(git rev-parse --quiet --verify "$REV^3" 2>/dev/null) &&
412+
u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
413413
u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
414414
}
415415

@@ -531,7 +531,8 @@ drop_stash () {
531531
die "$(eval_gettext "\${REV}: Could not drop stash entry")"
532532

533533
# 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
535536
}
536537

537538
apply_to_branch () {

0 commit comments

Comments
 (0)