From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Sep 2015 21:30:35 +0000 (-0700)
Subject: Sync with 2.5.2
X-Git-Tag: v2.6.0-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f0bc85462332644ecd2386e0f4fdc9948b9f47dc?hp=--cc

Sync with 2.5.2
---

f0bc85462332644ecd2386e0f4fdc9948b9f47dc
diff --cc builtin/show-branch.c
index c87c46eb38,344ae4ce2a..408ce70307
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@@ -784,12 -784,13 +784,14 @@@ int cmd_show_branch(int ac, const char 
  			else
  				msg++;
  			reflog_msg[i] = xstrfmt("(%s) %s",
 -						show_date(timestamp, tz, 1),
 +						show_date(timestamp, tz,
 +							  DATE_MODE(RELATIVE)),
  						msg);
  			free(logmsg);
- 			sprintf(nth_desc, "%s@{%d}", *av, base+i);
+ 
+ 			nth_desc = xstrfmt("%s@{%d}", *av, base+i);
  			append_ref(nth_desc, &oid, 1);
+ 			free(nth_desc);
  		}
  		free(ref);
  	}