mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 2.3.9

Browse Source
This commit is contained in:
Junio C Hamano
2015-09-04 10:34:19 -07:00
parent 8545932d45 ecad27cf98
commit ef0e938a1a
7 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/show-branch.c
View File

@ -723,7 +723,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (reflog) {
unsigned char sha1[20];
char nth_desc[256];
char *ref;
int base = 0;
unsigned int flags = 0;
@ -762,6 +761,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
for (i = 0; i < reflog; i++) {
char *logmsg;
char *nth_desc;
const char *msg;
unsigned long timestamp;
int tz;
@ -780,8 +780,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
show_date(timestamp, tz, 1),
msg);
free(logmsg);
sprintf(nth_desc, "%s@{%d}", *av, base+i);
nth_desc = xstrfmt("%s@{%d}", *av, base+i);
append_ref(nth_desc, sha1, 1);
free(nth_desc);
}
free(ref);
}