diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-19 03:58:51 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-19 03:58:51 +0300 |
commit | 52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (patch) | |
tree | 0d74002e3bf00e8350dcdec75d8b01a6f59e8b65 /git-fetch.sh | |
parent | 6eb668df76a5b46bd24c25d227bfdba12542b05a (diff) | |
parent | 0b4276931f4130e93f393cb8b9fa0ce2138f1d9c (diff) |
Merge branch 'master'
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-x | git-fetch.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 8564cbfd7a..6586e773e6 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -12,6 +12,7 @@ IFS="$LF" tags= append= force= +verbose= update_head_ok= while case "$#" in 0) break ;; esac do @@ -30,6 +31,9 @@ do --update-head-o|--update-head-ok) update_head_ok=t ;; + -v|--verbose) + verbose=Yes + ;; *) break ;; @@ -91,12 +95,12 @@ append_fetch_head () { then headc_=$(git-rev-parse --verify "$head_^0") || exit echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD" - echo >&2 "* committish: $head_" - echo >&2 " $note_" + [ "$verbose" ] && echo >&2 "* committish: $head_" + [ "$verbose" ] && echo >&2 " $note_" else echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD" - echo >&2 "* non-commit: $head_" - echo >&2 " $note_" + [ "$verbose" ] && echo >&2 "* non-commit: $head_" + [ "$verbose" ] && echo >&2 " $note_" fi if test "$local_name_" != "" then @@ -116,7 +120,7 @@ fast_forward_local () { then if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2" then - echo >&2 "* $1: same as $3" + [ "$verbose" ] && echo >&2 "* $1: same as $3" else echo >&2 "* $1: updating with $3" fi |