summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-03 08:43:03 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-03 08:43:03 -0700
commitf1ad05f3a524a8750533d8263ceb584a9e7ec573 (patch)
tree9a7c452694f2718b34ddebf32aacf5a373203d5c /bundle.c
parent8f780ca9be58d748c79e11b8dccad9474f4d1a19 (diff)
parentc29c46fa2e21e608ce2e603649af5bf38e7969c2 (diff)
downloadgit-f1ad05f3a524a8750533d8263ceb584a9e7ec573.tar.gz
Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1
* jk/fully-peeled-packed-ref: pack-refs: add fully-peeled trait pack-refs: write peeled entry for non-tags use parse_object_or_die instead of die("bad object") avoid segfaults on parse_object failure
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundle.c b/bundle.c
index 6210a6be89..505e07e934 100644
--- a/bundle.c
+++ b/bundle.c
@@ -279,12 +279,12 @@ int create_bundle(struct bundle_header *header, const char *path,
if (buf.len > 0 && buf.buf[0] == '-') {
write_or_die(bundle_fd, buf.buf, buf.len);
if (!get_sha1_hex(buf.buf + 1, sha1)) {
- struct object *object = parse_object(sha1);
+ struct object *object = parse_object_or_die(sha1, buf.buf);
object->flags |= UNINTERESTING;
add_pending_object(&revs, object, xstrdup(buf.buf));
}
} else if (!get_sha1_hex(buf.buf, sha1)) {
- struct object *object = parse_object(sha1);
+ struct object *object = parse_object_or_die(sha1, buf.buf);
object->flags |= SHOWN;
}
}
@@ -361,7 +361,7 @@ int create_bundle(struct bundle_header *header, const char *path,
* end up triggering "empty bundle"
* error.
*/
- obj = parse_object(sha1);
+ obj = parse_object_or_die(sha1, e->name);
obj->flags |= SHOWN;
add_pending_object(&revs, obj, e->name);
}