diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-24 12:18:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-24 12:18:02 -0700 |
| commit | b7fcd007153b5021ed70ddc0a224127f14601bbc (patch) | |
| tree | 5596bb4cd891229cc1a35399dbd0cc4b509d6833 | |
| parent | 8d9185bc12650a9839dff45a8754f05618cdb3f5 (diff) | |
| parent | ccef6048cd697063967e5e02937911fd8125b364 (diff) | |
| download | git-b7fcd007153b5021ed70ddc0a224127f14601bbc.tar.gz git-b7fcd007153b5021ed70ddc0a224127f14601bbc.tar.xz | |
Sync with 1.7.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 710d750cf..d08a8bb4f 100644 --- 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 6420918ab..8739bfacd 100644 --- 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); |