From f31dbdc7dad3511e1ee73cb04a032773d11231cd Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Thu, 9 Sep 2010 13:56:36 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/fetch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/fetch.c b/builtin/fetch.c index fccc9cbea3..6fc5047703 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -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..remote, we add the * ref given in branch..merge, too. + * + * Note: has_merge implies non-NULL branch->remote_name */ if (has_merge && !strcmp(branch->remote_name, remote->name)) -- 2.11.4.GIT