Merge branch 'jc/lockfile' into next

diff --git a/git-fetch.sh b/git-fetch.sh
index 69bd810082655a6ee7594e86a6e8e28e3e5a43e2..48818f822451b3d69e7cd90e81e34bf137ead4dd 100755 (executable)
--- 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"