Sync with 1.7.6.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 710d750cfd7a67bacedaa851afaeed4469d38a77..d08a8bb4f2bcf106f925346b274740cd7a136de9 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.6/git.html[documentation for release 1.7.6]
+* link:v1.7.6.1/git.html[documentation for release 1.7.6.1]
 
 * release notes for
+  link:RelNotes/1.7.6.1.txt[1.7.6.1].
   link:RelNotes/1.7.6.txt[1.7.6].
 
 * link:v1.7.5.4/git.html[documentation for release 1.7.5.4]

diff --git a/upload-pack.c b/upload-pack.c
index 6420918abea3a9a33ad967d263153e4548daab29..8739bfacdfd4e01e16a614dd419388fa93a904b6 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -533,6 +533,8 @@ static void check_non_tip(void)
        namebuf[41] = '\n';
        for (i = get_max_object_index(); 0 < i; ) {
                o = get_indexed_object(--i);
+               if (!o)
+                       continue;
                if (!(o->flags & OUR_REF))
                        continue;
                memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40);