summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-09-14 08:52:03 +0200
committerJunio C Hamano <gitster@pobox.com>2012-09-14 10:04:29 -0700
commit5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f (patch)
treeea0dc3f146a6a31dcb166dc3310376a1c8ddecc9 /sequencer.h
parentce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f (diff)
downloadgit-5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f.tar.gz
cherry-pick: don't forget -s on failure
In case 'git cherry-pick -s <commit>' 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 <vmiklos@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h4
1 files changed, 4 insertions, 0 deletions
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