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 /shallow.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 'shallow.c')
-rw-r--r-- | shallow.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -90,8 +90,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, cur_depth = *(int *)commit->util; } } - if (parse_commit(commit)) - die("invalid commit"); + parse_commit_or_die(commit); cur_depth++; if (cur_depth >= depth) { commit_list_insert(commit, &result); |