diff options
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index fe0ef44b40..f20b27b8a9 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -181,7 +181,7 @@ static void shortlog(const char *name, unsigned char *sha1, int flags = UNINTERESTING | TREECHANGE | SEEN | SHOWN | ADDED; branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40); - if (!branch || branch->type != TYPE_COMMIT) + if (!branch || branch->type != OBJ_COMMIT) return; setup_revisions(0, NULL, rev, NULL); |