diff --git a/git-pull.sh b/git-pull.sh
index 8866f2a1e2bda178ae87acb02037527d8f1abeab..2c7f432dc04254dcb9906f4d078eb16d195848ca 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
do
case "$1" in
-q|--quiet)
- verbosity=-q ;;
+ verbosity="$verbosity -q" ;;
-v|--verbose)
- verbosity=-v ;;
+ verbosity="$verbosity -v" ;;
-n|--no-stat|--no-summary)
no_stat=-n ;;
--stat|--summary)
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.