summaryrefslogtreecommitdiff
path: root/http-walker.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-19 18:28:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-19 18:28:06 (GMT)
commit679639904da05f7d84e9215960e76dd0f3353328 (patch)
treea60e891d49b1de93d135fd5d79171f4c09b98040 /http-walker.c
parent03db4525d38119f7778d6e9117f27c47db8466d4 (diff)
parenta1b6fb04b1c1b581dfac5c13641af8b3ae44810f (diff)
downloadgit-679639904da05f7d84e9215960e76dd0f3353328.zip
git-679639904da05f7d84e9215960e76dd0f3353328.tar.gz
git-679639904da05f7d84e9215960e76dd0f3353328.tar.bz2
Merge branch 'maint'
* maint: GIT 1.5.6.4 builtin-rm: fix index lock file path http-fetch: do not SEGV after fetching a bad pack idx file rev-list: honor --quiet option api-run-command.txt: typofix
Diffstat (limited to 'http-walker.c')
-rw-r--r--http-walker.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http-walker.c b/http-walker.c
index 51c18f2..9dc6b27 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -442,6 +442,8 @@ static int setup_index(struct walker *walker, struct alt_base *repo, unsigned ch
return -1;
new_pack = parse_pack_index(sha1);
+ if (!new_pack)
+ return -1; /* parse_pack_index() already issued error message */
new_pack->next = repo->packs;
repo->packs = new_pack;
return 0;