зеркало из https://github.com/microsoft/git.git
builtin/fetch.c: comment that branch->remote_name is usable when has_merge
Save future readers the trouble of tracing code to determine that the two uses of branch->remote_name are safe when has_merge is set, by adding a comment explaining that it is so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a1d558d254
Коммит
f31dbdc7da
|
@ -148,6 +148,7 @@ static struct ref *get_ref_map(struct transport *transport,
|
|||
int has_merge = branch_has_merge_config(branch);
|
||||
if (remote &&
|
||||
(remote->fetch_refspec_nr ||
|
||||
/* Note: has_merge implies non-NULL branch->remote_name */
|
||||
(has_merge && !strcmp(branch->remote_name, remote->name)))) {
|
||||
for (i = 0; i < remote->fetch_refspec_nr; i++) {
|
||||
get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
|
||||
|
@ -162,6 +163,8 @@ static struct ref *get_ref_map(struct transport *transport,
|
|||
* if the remote we're fetching from is the same
|
||||
* as given in branch.<name>.remote, we add the
|
||||
* ref given in branch.<name>.merge, too.
|
||||
*
|
||||
* Note: has_merge implies non-NULL branch->remote_name
|
||||
*/
|
||||
if (has_merge &&
|
||||
!strcmp(branch->remote_name, remote->name))
|
||||
|
|
Загрузка…
Ссылка в новой задаче