Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-stash: use git rev-parse -q
author
Miklos Vajna
<vmiklos@frugalware.org>
Tue, 2 Dec 2008 00:56:09 +0000
(
01:56
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 3 Dec 2008 00:54:01 +0000
(16:54 -0800)
Don't redirect stderr to /dev/null, use -q to suppress the output on
stderr.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-stash.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9b3b7fd
)
diff --git
a/git-stash.sh
b/git-stash.sh
index b9ace9970492aaf48472904d978d809d90ca33db..c0532e8751d361d2875f87a43ff5a519ea7e08ea 100755
(executable)
--- a/
git-stash.sh
+++ b/
git-stash.sh
@@
-30,7
+30,7
@@
clear_stash () {
then
die "git stash clear with parameters is unimplemented"
fi
then
die "git stash clear with parameters is unimplemented"
fi
- if current=$(git rev-parse -
-verify $ref_stash 2>/dev/null
)
+ if current=$(git rev-parse -
q --verify $ref_stash
)
then
git update-ref -d $ref_stash $current
fi
then
git update-ref -d $ref_stash $current
fi
@@
-129,7
+129,7
@@
save_stash () {
}
have_stash () {
}
have_stash () {
- git rev-parse -
-verify $ref_stash >/dev/null 2>&1
+ git rev-parse -
q --verify $ref_stash >/dev/null
}
list_stash () {
}
list_stash () {
@@
-229,16
+229,16
@@
drop_stash () {
fi
# Verify supplied argument looks like a stash entry
s=$(git rev-parse --verify "$@") &&
fi
# Verify supplied argument looks like a stash entry
s=$(git rev-parse --verify "$@") &&
- 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
||
+ 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
||
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
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 -
-verify "$ref_stash@{0}" > /dev/null 2>&1
|| clear_stash
+ git rev-parse -
q --verify "$ref_stash@{0}" > /dev/null
|| clear_stash
}
apply_to_branch () {
}
apply_to_branch () {