From: Junio C Hamano <junkio@cox.net>
Date: Fri, 29 Dec 2006 00:32:17 +0000 (-0800)
Subject: Allow non-fast-forward of remote tracking branches in default clone
X-Git-Tag: v1.5.0-rc1~159
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=013672bc589da395fcba9bf62d699e70f3764689;p=git.git

Allow non-fast-forward of remote tracking branches in default clone

This changes the default remote.origin.fetch configuration
created by git-clone so that it allows non-fast-forward updates.

When using the separate-remote layout with reflog enabled, it
does not make much sense to refuse to update the remote tracking
branch just because some of them do not fast-forward.  git-fetch
issues warnings on non-fast-forwardness, and the user can peek
at what the previous state was using the reflog.

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

diff --git a/git-clone.sh b/git-clone.sh
index f37eb9d10..3d388de62 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -388,7 +388,7 @@ then
 
 		# Set up the mappings to track the remote branches.
 		git-repo-config remote."$origin".fetch \
-			"refs/heads/*:$remote_top/*" '^$' &&
+			"+refs/heads/*:$remote_top/*" '^$' &&
 		rm -f "refs/remotes/$origin/HEAD"
 		git-symbolic-ref "refs/remotes/$origin/HEAD" \
 			"refs/remotes/$origin/$head_points_at" &&