kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2006-12-28 16:32:17 -08:00
parent e19b9ddab3
commit 013672bc58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-clone.sh
View File

@ -388,7 +388,7 @@ then


# Set up the mappings to track the remote branches. # Set up the mappings to track the remote branches.
git-repo-config remote."$origin".fetch \ git-repo-config remote."$origin".fetch \
"refs/heads/*:$remote_top/*" '^$' && "+refs/heads/*:$remote_top/*" '^$' &&
rm -f "refs/remotes/$origin/HEAD" rm -f "refs/remotes/$origin/HEAD"
git-symbolic-ref "refs/remotes/$origin/HEAD" \ git-symbolic-ref "refs/remotes/$origin/HEAD" \
"refs/remotes/$origin/$head_points_at" && "refs/remotes/$origin/$head_points_at" &&