diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-28 16:32:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 18:37:33 -0800 |
| commit | 013672bc589da395fcba9bf62d699e70f3764689 (patch) | |
| tree | 1a975ac6117cbe6bba07de4c4ff2312184dc8e01 /git-clone.sh | |
| parent | e19b9ddab3fb7bd3bf6ed6629d3f014722e57a31 (diff) | |
| download | git-013672bc589da395fcba9bf62d699e70f3764689.tar.gz git-013672bc589da395fcba9bf62d699e70f3764689.tar.xz | |
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>
Diffstat (limited to 'git-clone.sh')
| -rwxr-xr-x | git-clone.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" && |