diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-21 22:10:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-21 22:12:42 -0800 |
| commit | 9e11554917d391c18e043bc0b38ee0377e69568e (patch) | |
| tree | ccb0eea6c3a68f8b54dfc0f31d59c7824f0b8272 | |
| parent | 64646d11773774193093df96020d3fcb0df4a270 (diff) | |
| download | git-9e11554917d391c18e043bc0b38ee0377e69568e.tar.gz git-9e11554917d391c18e043bc0b38ee0377e69568e.tar.xz | |
Revert "git-pull: refuse default merge without branch.*.merge"
This reverts commit a71fb0a1412c82405f078fb536797d3f5de68d53.
The logic to decide when to refuse to use the default "first set of
refs fetched" for merge was utterly bogus.
In a repository that happily worked correctly without any of the
per-branch configuration crap did not have (and did not have to
have) any branch.<current>.merge. With that broken commit, pulling
from origin no longer would work.
| -rwxr-xr-x | git-parse-remote.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index ea7511e8a..871c08f09 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -141,8 +141,7 @@ canon_refs_list_for_fetch () { curr_branch=$(git-symbolic-ref HEAD | \ sed -e 's|^refs/heads/||') merge_branches=$(git-repo-config \ - --get-all "branch.${curr_branch}.merge") || - merge_branches=.this.would.never.match.any.ref. + --get-all "branch.${curr_branch}.merge") fi set x $(expand_refs_wildcard "$@") shift |