Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maint

gitster · gitster · commit a116022e03d3 · 2017-10-18T14:19:14.000+09:00
* sb/branch-avoid-repeated-strbuf-release:
  branch: reset instead of release a strbuf
diff --git a/builtin/branch.c b/builtin/branch.c
@@ -216,7 +216,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 		if (!head_rev)
 			die(_("Couldn't look up commit object for HEAD"));
 	}
-	for (i = 0; i < argc; i++, strbuf_release(&bname)) {
+	for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
 		char *target = NULL;
 		int flags = 0;
 
@@ -281,8 +281,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 	}
 
 	free(name);
+	strbuf_release(&bname);
 
-	return(ret);
+	return ret;
 }
 
 static int calc_maxwidth(struct ref_array *refs, int remote_bonus)

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,`
`216`	`216`	`if (!head_rev)`
`217`	`217`	`die(_("Couldn't look up commit object for HEAD"));`
`218`	`218`	`}`
`219`		`- for (i = 0; i < argc; i++, strbuf_release(&bname)) {`
	`219`	`+ for (i = 0; i < argc; i++, strbuf_reset(&bname)) {`
`220`	`220`	`char *target = NULL;`
`221`	`221`	`int flags = 0;`
`222`	`222`
`@@ -281,8 +281,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`free(name);`
	`284`	`+ strbuf_release(&bname);`
`284`	`285`
`285`		`- return(ret);`
	`286`	`+ return ret;`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`static int calc_maxwidth(struct ref_array *refs, int remote_bonus)`