diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-06 00:54:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 00:54:01 +0400 |
| commit | 5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7 (patch) | |
| tree | 52523c896b1eb72ed8cddb52261b7f9a909b71f0 /builtin/branch.c | |
| parent | b2a0afd96a40d6cdbba96ac9735a7b489d8d563e (diff) | |
| parent | 3c62183929080c17299d5b404eb092e3d53c161a (diff) | |
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 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index f157f92f48..636a16ea4e 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -502,7 +502,7 @@ static void add_verbose_info(struct strbuf *out, struct ref_item *item, const char *sub = _(" **** invalid ref ****"); struct commit *commit = item->commit; - if (commit && !parse_commit(commit)) { + if (!parse_commit(commit)) { pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); sub = subject.buf; } |