diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
| commit | 1259404c7e5cd88b7f6692986469cd20cbfacdad (patch) | |
| tree | cadffdf850a06e1d41ce1ebf4d1290e8d5768cfc /git-clone.sh | |
| parent | b4aee09e610567529dc619d7324dc2fe85a11db5 (diff) | |
| parent | a153adf683d2b6e22c7e892ed8a161b140156186 (diff) | |
| download | git-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: Fix setting $/ in parse_commit()
daemon: do not die on older clients.
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
git-clone: honor --quiet
Documentation for the [remote] config
prune-packed: Fix uninitialized variable.
Diffstat (limited to 'git-clone.sh')
| -rwxr-xr-x | git-clone.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-clone.sh b/git-clone.sh index 786d65a859..3f006d1a77 100755 --- 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" |