merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/git-clone.sh b/git-clone.sh
index 786d65a8591235fde0cb8e34a497a4be18bf8410..3f006d1a778636e5906ad9e8671adb6561fa0d98 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -401,7 +401,8 @@ Pull: refs/heads/$head_points_at:$origin_track" &&
 
        case "$no_checkout" in
        '')
-               git-read-tree -m -u -v HEAD HEAD
+               test "z$quiet" = z && v=-v || v=
+               git-read-tree -m -u $v HEAD HEAD
        esac
 fi
 rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"