]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/log.c
cherry: remove redundant check for merge commit
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 29 Jul 2012 23:25:36 +0000 (16:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 00:39:56 +0000 (17:39 -0700)
commit51f4de3ac993b52c8a2fab9ca3acc665fca2d833
tree3b6f4d82a27d273b29b83b9e08d3b3fdbcf869e1
parent38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801
cherry: remove redundant check for merge commit

While walking the revision list in get_patch_ids and cmd_cherry, we
check for each commit if there is more than one parent and ignore
the commit if that is the case. Instead, set rev_info.max_parents to
1 and let the revision traversal code handle it for us.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/log.c