diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:54:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:54:01 -0800 |
| commit | 5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7 (patch) | |
| tree | 52523c896b1eb72ed8cddb52261b7f9a909b71f0 /notes-utils.c | |
| parent | b2a0afd96a40d6cdbba96ac9735a7b489d8d563e (diff) | |
| parent | 3c62183929080c17299d5b404eb092e3d53c161a (diff) | |
| download | git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.tar.gz | |
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 'notes-utils.c')
| -rw-r--r-- | notes-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-utils.c b/notes-utils.c index 9107c379d9..7bb3473dbe 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -18,7 +18,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents, unsigned char parent_sha1[20]; if (!read_ref(t->ref, parent_sha1)) { struct commit *parent = lookup_commit(parent_sha1); - if (!parent || parse_commit(parent)) + if (parse_commit(parent)) die("Failed to find/parse commit %s", t->ref); commit_list_insert(parent, &parents); } |