Re: [PATCH v3 02/14] remote.c: refactor setup of branch-merge list

2015-05-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: When we call branch_get() to lookup or create a struct branch, we make sure the merge field is filled in so that callers can access it. But the conditions under which we do so are a little confusing, and can lead to two funny situations: ... In addition to

[PATCH v3 02/14] remote.c: refactor setup of branch-merge list

2015-05-20 Thread Jeff King
When we call branch_get() to lookup or create a struct branch, we make sure the merge field is filled in so that callers can access it. But the conditions under which we do so are a little confusing, and can lead to two funny situations: 1. If there's no branch.*.remote config, we cannot