kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* sb/branch-avoid-repeated-strbuf-release:
  branch: reset instead of release a strbuf
maint
Junio C Hamano 2017-10-18 14:19:14 +09:00
parent 4bf90c1740 a9155c50bd
commit a116022e03
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/branch.c
View File

@ -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)