sha1_name.c: avoid unnecessary strbuf_release

drafnel · gitster · commit b45a09c4b4a8 · 2009-07-16T15:09:21.000-07:00
When we fall back to a standard for_each_reflog_ent() after failing to find
the nth branch switch (or if we had a short reflog) with the call to
for_each_recent_reflog_ent(), we do not need to free the memory allocated
for our strbuf's since a strbuf_reset() will be performed in
grab_nth_branch_switch() before assigning to the entry.

Plus, the strbuf_release() negates the non-zero hint we initially gave to
strbuf_init() just above these lines.

Signed-off-by: Brandon Casey &lt;drafnel@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/sha1_name.c b/sha1_name.c
@@ -777,8 +777,6 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
 	for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb);
 	if (cb.cnt < nth) {
 		cb.cnt = 0;
-		for (i = 0; i < nth; i++)
-			strbuf_release(&cb.buf[i]);
 		for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb);
 	}
 	if (cb.cnt < nth)

Original file line number	Diff line number	Diff line change
`@@ -777,8 +777,6 @@ int interpret_branch_name(const char name, struct strbuf buf)`
`777`	`777`	`for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb);`
`778`	`778`	`if (cb.cnt < nth) {`
`779`	`779`	`cb.cnt = 0;`
`780`		`- for (i = 0; i < nth; i++)`
`781`		`- strbuf_release(&cb.buf[i]);`
`782`	`780`	`for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb);`
`783`	`781`	`}`
`784`	`782`	`if (cb.cnt < nth)`