diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 20:54:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 20:54:01 (GMT) |
| commit | 5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7 (patch) | |
| tree | 52523c896b1eb72ed8cddb52261b7f9a909b71f0 /upload-pack.c | |
| parent | b2a0afd96a40d6cdbba96ac9735a7b489d8d563e (diff) | |
| parent | 3c62183929080c17299d5b404eb092e3d53c161a (diff) | |
| download | git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.zip git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.tar.gz git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.tar.bz2 | |
Merge branch 'jk/robustify-parse-commit'
* jk/robustify-parse-commit:
checkout: do not die when leaving broken detached HEAD
use parse_commit_or_die instead of custom message
use parse_commit_or_die instead of segfaulting
assume parse_commit checks for NULL commit
assume parse_commit checks commit->object.parsed
log_tree_diff: die when we fail to parse a commit
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index c989a73..d30f339 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -649,8 +649,7 @@ static void receive_needs(void) /* make sure the real parents are parsed */ unregister_shallow(object->sha1); object->parsed = 0; - if (parse_commit((struct commit *)object)) - die("invalid commit"); + parse_commit_or_die((struct commit *)object); parents = ((struct commit *)object)->parents; while (parents) { add_object_array(&parents->item->object, |