Sync with 2.4.9

diff --cc Documentation/git.txt
index 5a78d77533f18c96a0fbee7ac97ba8478eb169ca,97d9fb41b2b41555732cc349da043f7ce3a2f24a..3b5573d1919b7c6bd5edffa05adb4900a870e00e
--- 1/Documentation/git.txt
--- 2/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.4.8/git.html[documentation for release 2.4.8]
 +* 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.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 323f85746358676cccecd646e6cb820e723031cf,9b0aba2accee0b1984aba859b22b423f0bab5dec..344ae4ce2a8d95f0aca6f93ef2d714db059e6431
--- 1/builtin/show-branch.c
--- 2/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);
        }

diff --cc notes.c
Simple merge

diff --cc sha1_file.c
Simple merge

diff --cc unpack-trees.c
Simple merge