From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Jul 2006 20:01:27 +0000 (-0700)
Subject: git-fetch: fix --keep vs --thin
X-Git-Tag: v1.4.2-rc2~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=482faa8dafdf5dcf207b866b9c757271d9a45301;p=git.git

git-fetch: fix --keep vs --thin

When --keep is specified there is no reason to pass --thin to git-fetch-pack,
which are mutually exclusive.  This does not hurt because fetch-pack disables
thin transfer when both are given internally, but still is confusing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-fetch.sh b/git-fetch.sh
index ee99280a2..b6a223ee4 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -20,6 +20,7 @@ verbose=
 update_head_ok=
 exec=
 upload_pack=
+keep=--thin
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
@@ -347,7 +348,7 @@ fetch_main () {
     ( : subshell because we muck with IFS
       IFS=" 	$LF"
       (
-	  git-fetch-pack $exec $keep --thin "$remote" $rref || echo failed "$remote"
+	  git-fetch-pack $exec $keep "$remote" $rref || echo failed "$remote"
       ) |
       while read sha1 remote_name
       do