From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Sep 2015 17:43:23 +0000 (-0700)
Subject: Sync with 2.4.9
X-Git-Tag: v2.5.2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d3caf0b78106c390fc5daceb95ee968312765dd;p=thirdparty%2Fgit.git

Sync with 2.4.9
---

3d3caf0b78106c390fc5daceb95ee968312765dd
diff --cc Documentation/git.txt
index 5a78d77533,97d9fb41b2..3b5573d191
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,15 -43,10 +43,16 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.5.1/git.html[documentation for release 2.5.1]
 +
 +* release notes for
 +  link:RelNotes/2.5.1.txt[2.5.1],
 +  link:RelNotes/2.5.0.txt[2.5].
 +
- * link:v2.4.8/git.html[documentation for release 2.4.8]
+ * link:v2.4.9/git.html[documentation for release 2.4.9]
  
  * release notes for
+   link:RelNotes/2.4.9.txt[2.4.9],
    link:RelNotes/2.4.8.txt[2.4.8],
    link:RelNotes/2.4.7.txt[2.4.7],
    link:RelNotes/2.4.6.txt[2.4.6],
diff --cc builtin/show-branch.c
index 323f857463,9b0aba2acc..344ae4ce2a
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@@ -729,8 -722,7 +729,7 @@@ int cmd_show_branch(int ac, const char 
  		all_heads = 1;
  
  	if (reflog) {
 -		unsigned char sha1[20];
 +		struct object_id oid;
- 		char nth_desc[256];
  		char *ref;
  		int base = 0;
  		unsigned int flags = 0;
@@@ -787,8 -780,10 +787,10 @@@
  						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);
 +			append_ref(nth_desc, &oid, 1);
+ 			free(nth_desc);
  		}
  		free(ref);
  	}