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' 

* sb/branch-avoid-repeated-strbuf-release:
  branch: reset instead of release a strbuf
maint
Junio C Hamano 2017-10-07 16:27:54 +09:00
parent bd40f41b7b a9155c50bd
commit cfa0fd0ffc
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

@ -217,7 +217,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (!head_rev) if (!head_rev)
die(_("Couldn't look up commit object for HEAD")); 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; char *target = NULL;
int flags = 0; int flags = 0;


@ -282,8 +282,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
} }


free(name); free(name);
strbuf_release(&bname);


return(ret); return ret;
} }


static int calc_maxwidth(struct ref_array *refs, int remote_bonus) static int calc_maxwidth(struct ref_array *refs, int remote_bonus)