Revert "git-pull: refuse default merge without branch.*.merge"
This reverts commit a71fb0a141
.
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.
This commit is contained in:
parent
64646d1177
commit
9e11554917
@ -141,8 +141,7 @@ canon_refs_list_for_fetch () {
|
|||||||
curr_branch=$(git-symbolic-ref HEAD | \
|
curr_branch=$(git-symbolic-ref HEAD | \
|
||||||
sed -e 's|^refs/heads/||')
|
sed -e 's|^refs/heads/||')
|
||||||
merge_branches=$(git-repo-config \
|
merge_branches=$(git-repo-config \
|
||||||
--get-all "branch.${curr_branch}.merge") ||
|
--get-all "branch.${curr_branch}.merge")
|
||||||
merge_branches=.this.would.never.match.any.ref.
|
|
||||||
fi
|
fi
|
||||||
set x $(expand_refs_wildcard "$@")
|
set x $(expand_refs_wildcard "$@")
|
||||||
shift
|
shift
|
||||||
|
Loading…
Reference in New Issue
Block a user