Junio C Hamano <[email protected]> writes:

> Phillip Wood <[email protected]> writes:
>
>> From: Phillip Wood <[email protected]>
>>
>> I've updated these based on the feedback for v2. I've dropped the
>> patch that stopped print_commit_summary() from dying as I think it is
>> better to die than return an error (see the commit message of the
>> patch that adds print_commit_summary() for the reasoning). Apart from
>> that they're minor changes - style fixes and a reworded a commit message.
>
> Thanks for further polishing this topic; I found nothing in the
> update that was questionable.  Will replace.
>
> With this, perhaps it is ready for 'next'?

Not really.  I needed at least this to get it even compile, which
hints that I do not yet know what _else_ I missed by skimming this
round of the series.

 sequencer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 37460db6b1..63cfb6ddd9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1139,8 +1139,8 @@ static int do_commit(const char *msg_file, const char 
*author,
                        unlink(git_path_cherry_pick_head());
                        unlink(git_path_merge_msg());
                        if (!is_rebase_i(opts))
-                               res = print_commit_summary(NULL, &oid,
-                                               SUMMARY_SHOW_AUTHOR_DATE);
+                               print_commit_summary(NULL, &oid,
+                                                    SUMMARY_SHOW_AUTHOR_DATE);
                        return res;
                }
        }
-- 
2.15.0-372-g9a6f8facfd

Reply via email to