diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-04 10:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-04 10:25:23 -0700 |
| commit | f54cb059b18e704d8b51d0cd4736344422650d6f (patch) | |
| tree | 324187d0682f989593a532d231acf8472d4d2f2b /builtin | |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
| parent | 78f23bdf68dae56d644892990484951583a64014 (diff) | |
| download | git-f54cb059b18e704d8b51d0cd4736344422650d6f.tar.gz git-f54cb059b18e704d8b51d0cd4736344422650d6f.tar.xz | |
Merge branch 'jk/long-paths' into maint-2.2
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/show-branch.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 270e39c6c..9e60b1244 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -720,7 +720,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; @@ -759,6 +758,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; @@ -777,8 +777,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); } |