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.
Junio C Hamano committed
Dec 21, 2006 at 22:10 UTC
9e11554917d391c18e043bc0b38ee0377e69568e
1 file changed
+1
-2
git-parse-remote.sh
+1
-2
@@ -141,8 +141,7 @@ canon_refs_list_for_fetch () {
141
curr_branch=$(git-symbolic-ref HEAD | \
142
sed -e 's|^refs/heads/||')
143
merge_branches=$(git-repo-config \
144
- --get-all "branch.${curr_branch}.merge") ||
145
- merge_branches=.this.would.never.match.any.ref.
144
+ --get-all "branch.${curr_branch}.merge")
145
fi
146
set x $(expand_refs_wildcard "$@")
147
shift