summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2019-03-29 11:08:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-18 04:48:42 (GMT)
commitd74f3e58114d1a8544592fcd5dcdfe0fc4993d27 (patch)
tree3bbcec2e4b738475e520f259695867653bfed0b0 /sequencer.h
parentffac537e6cbbf934b08745a378932722df287a53 (diff)
downloadgit-d74f3e58114d1a8544592fcd5dcdfe0fc4993d27.zip
git-d74f3e58114d1a8544592fcd5dcdfe0fc4993d27.tar.gz
git-d74f3e58114d1a8544592fcd5dcdfe0fc4993d27.tar.bz2
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 <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index 4d505b3..82bc7a4 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;