From d74f3e58114d1a8544592fcd5dcdfe0fc4993d27 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Fri, 29 Mar 2019 11:08:42 +0000 Subject: sequencer: fix cleanup with --signoff and -x Before commit 356ee4659b ("sequencer: try to commit without forking 'git commit'", 2017-11-24) when --signoff or -x were given on the command line the commit message was cleaned up with --cleanup=space or commit.cleanup if it was set. Unfortunately this behavior was lost when I implemented committing without forking. Fix this and add some tests to catch future regressions. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- sequencer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sequencer.h') diff --git a/sequencer.h b/sequencer.h index 4d505b3590..82bc7a48d5 100644 --- a/sequencer.h +++ b/sequencer.h @@ -47,6 +47,7 @@ struct replay_opts { char *gpg_sign; enum commit_msg_cleanup_mode default_msg_cleanup; + int explicit_cleanup; /* Merge strategy */ char *strategy; -- cgit v1.2.3