diff options
author | lookshe <github@lookshe.org> | 2016-02-08 13:55:06 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-02-08 13:55:06 +0100 |
commit | a4d069bbd96810a7e3efc0d32c2889c83b9747e3 (patch) | |
tree | 88e2c697e31ea52aa0dba83e272d43e63eca9ad5 /ui-log.c | |
parent | 1ca23059758b5d1af843aa62a4aeb5de5b6bd5c8 (diff) | |
parent | 23f7dadaaba2817c92c42c0a642a3186aa8ef24d (diff) |
Merge branch 'master' into flatten_tree
Diffstat (limited to 'ui-log.c')
-rw-r--r-- | ui-log.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -141,7 +141,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs) /* When we get here we have precisely one parent. */ parent = parents->item; - parse_commit(parent); + /* If we can't parse the commit, let print_commit() report an error. */ + if (parse_commit(parent)) + return 1; files = 0; add_lines = 0; |