diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-21 22:39:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-21 22:56:25 -0800 |
| commit | d41cb273d313a21979b05dba57d0c6b565b28ba6 (patch) | |
| tree | 3bdfd6e084c4dc9b827b2e246124e23b9faf1ef9 | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-d41cb273d313a21979b05dba57d0c6b565b28ba6.tar.xz | |
parse-remote: mark all refs not for merge only when fetching more than one
An earlier commit a71fb0a1 implemented much requested safety
valve to refuse "git pull" or "git pull origin" without explicit
refspecs from using the first set of remote refs obtained by
reading .git/remotes/origin file or branch.*.fetch configuration
variables to create a merge. The argument was that while on a
branch different from the default branch, it is often wrong to
merge the default remote ref suitable for merging into the master.
That is fine as a theory. But many repositories already in use
by people in the real world do not have any of the per branch
configuration crap. They did not need it, and they do not need
it now. Merging with the first remote ref listed was just fine,
because they had only one ref (e.g. 'master' from linux-2.6.git)
anyway.
So this changes the safety valve to be a lot looser. When "git
fetch" gets only one remote branch, the irritating warning would
not trigger anymore.
I think we could also make the warning trigger when branch.*.merge
is not specified for the current branch, but is for some other
branch. That is for another commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-parse-remote.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 871c08f097..f163821d03 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -136,6 +136,8 @@ canon_refs_list_for_fetch () { if test "$1" = "-d" then shift ; remote="$1" ; shift + set x $(expand_refs_wildcard "$@") + shift if test "$remote" = "$(get_default_remote)" then curr_branch=$(git-symbolic-ref HEAD | \ @@ -143,8 +145,13 @@ canon_refs_list_for_fetch () { merge_branches=$(git-repo-config \ --get-all "branch.${curr_branch}.merge") fi - set x $(expand_refs_wildcard "$@") - shift + # If we are fetching only one branch, then first branch + # is the only thing that makes sense to merge anyway, + # so there is no point refusing that traditional rule. + if test $# != 1 && test "z$merge_branches" = z + then + merge_branches=..this..would..never..match.. + fi fi for ref do |