summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-12-03 13:26:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-03 22:27:17 (GMT)
commit2d17985782256d3505791a814b16e4e772fd341f (patch)
tree1c526ad2a35fc7505fcf2ed5001501407088cfb0 /git-pull.sh
parenta86e8c1cfcb576d2d5b3a3499acc48684280dccb (diff)
downloadgit-2d17985782256d3505791a814b16e4e772fd341f.zip
git-2d17985782256d3505791a814b16e4e772fd341f.tar.gz
git-2d17985782256d3505791a814b16e4e772fd341f.tar.bz2
pull: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 1cac898..2c7f432 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -121,13 +121,13 @@ test true = "$rebase" && {
test -z "$origin" && origin=$(get_default_remote)
reflist="$(get_remote_refs_for_fetch "$@" 2>/dev/null |
sed "s|refs/heads/\(.*\):|\1|")" &&
- oldremoteref="$(git rev-parse --verify \
- "refs/remotes/$origin/$reflist" 2>/dev/null)"
+ oldremoteref="$(git rev-parse -q --verify \
+ "refs/remotes/$origin/$reflist")"
}
-orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
+orig_head=$(git rev-parse -q --verify HEAD)
git fetch $verbosity --update-head-ok "$@" || exit 1
-curr_head=$(git rev-parse --verify HEAD 2>/dev/null)
+curr_head=$(git rev-parse -q --verify HEAD)
if test -n "$orig_head" && test "$curr_head" != "$orig_head"
then
# The fetch involved updating the current branch.