From 5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 14 Sep 2012 08:52:03 +0200 Subject: cherry-pick: don't forget -s on failure In case 'git cherry-pick -s ' failed, the user had to use 'git commit -s' (i.e. state the -s option again), which is easy to forget about. Instead, write the signed-off-by line early, so plain 'git commit' will have the same result. Also update 'git commit -s', so that in case there is already a relevant Signed-off-by line before the Conflicts: line, it won't add one more at the end of the message. If there is no such line, then add it before the the Conflicts: line. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- sequencer.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sequencer.h') diff --git a/sequencer.h b/sequencer.h index d8494201e0..60287b8da2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -49,4 +49,8 @@ extern void remove_sequencer_state(void); int sequencer_pick_revisions(struct replay_opts *opts); +extern const char sign_off_header[]; + +void append_signoff(struct strbuf *msgbuf, int ignore_footer); + #endif -- cgit v1.2.3