diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:31:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:31:21 -0800 |
| commit | 3ddad98b74924d76116d05e7601ab1e163d68500 (patch) | |
| tree | 203307192a8a98545f0cb892ed477766f622c9cf /git-clone.sh | |
| parent | e6f95113431f7e69263bc3d075c0a7715ce587e3 (diff) | |
| parent | b0e908977ebe43b49badad7fe34bf259dd5d263b (diff) | |
| download | git-3ddad98b74924d76116d05e7601ab1e163d68500.tar.gz git-3ddad98b74924d76116d05e7601ab1e163d68500.tar.xz | |
Merge branch 'js/fetch-progress' (early part)
* 'js/fetch-progress' (early part):
Fixup no-progress for fetch & clone
fetch & clone: do not output progress when not on a tty
Conflicts:
git-fetch.sh
Diffstat (limited to 'git-clone.sh')
| -rwxr-xr-x | git-clone.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-clone.sh b/git-clone.sh index 1bd54ded3..de5198358 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -79,6 +79,8 @@ origin= origin_override= use_separate_remote=t depth= +no_progress= +test -t 1 || no_progress=--no-progress while case "$#,$1" in 0,*) break ;; @@ -290,8 +292,8 @@ yes,yes) ;; *) case "$upload_pack" in - '') git-fetch-pack --all -k $quiet $depth "$repo" ;; - *) git-fetch-pack --all -k $quiet "$upload_pack" $depth "$repo" ;; + '') git-fetch-pack --all -k $quiet $depth $no_progress "$repo";; + *) git-fetch-pack --all -k $quiet "$upload_pack" $depth $no_progress "$repo" ;; esac >"$GIT_DIR/CLONE_HEAD" || die "fetch-pack from '$repo' failed." ;; @@ -393,7 +395,7 @@ then case "$no_checkout" in '') - test "z$quiet" = z && v=-v || v= + test "z$quiet" = z -a "z$no_progress" = z && v=-v || v= git-read-tree -m -u $v HEAD HEAD esac fi |