diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-04 07:01:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 07:01:52 (GMT) |
| commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
| tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /git-fetch.sh | |
| parent | b9d301bca767c9c26b8514fb326dd237cb269fbb (diff) | |
| parent | e96fd30553bb57a76ad38f703a3fea5b53c45ff9 (diff) | |
| download | git-f63237a18e951b93ac46a0e594f286255e1eaaaf.zip git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.gz git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.bz2 | |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 69bd810..48818f8 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -166,7 +166,10 @@ fast_forward_local () { mb=$(git-merge-base "$local" "$2") && case "$2,$mb" in $local,*) - echo >&2 "* $1: same as $3" + if test -n "$verbose" + then + echo >&2 "* $1: same as $3" + fi ;; *,$local) echo >&2 "* $1: fast forward to $3" |