From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2019 02:18:41 +0000 (-0800)
Subject: Merge branch 'rj/sequencer-sign-off-header-static'
X-Git-Tag: v2.21.0-rc1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ac5444cba9349a5f89e64e1774ea9d6740a5add;p=git

Merge branch 'rj/sequencer-sign-off-header-static'

Code clean-up.

* rj/sequencer-sign-off-header-static:
  sequencer: make sign_off_header a file local symbol
---

8ac5444cba9349a5f89e64e1774ea9d6740a5add
diff --cc sequencer.h
index 93e891309b,e025deb007..4d505b3590
--- a/sequencer.h
+++ b/sequencer.h
@@@ -93,31 -74,17 +93,29 @@@ int sequencer_remove_state(struct repla
   * commits should be rebased onto the new base, this flag needs to be passed.
   */
  #define TODO_LIST_REBASE_COUSINS (1U << 4)
 -int sequencer_make_script(FILE *out, int argc, const char **argv,
 +int sequencer_make_script(struct repository *repo, FILE *out,
 +			  int argc, const char **argv,
  			  unsigned flags);
  
 -int sequencer_add_exec_commands(const char *command);
 -int transform_todos(unsigned flags);
 -int check_todo_list(void);
 -int skip_unnecessary_picks(void);
 -int rearrange_squash(void);
 +int sequencer_add_exec_commands(struct repository *r, const char *command);
 +int transform_todos(struct repository *r, unsigned flags);
 +enum missing_commit_check_level get_missing_commit_check_level(void);
 +int check_todo_list(struct repository *r);
 +int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 +		    const char *shortrevisions, const char *onto_name,
 +		    const char *onto, const char *orig_head, const char *cmd,
 +		    unsigned autosquash);
 +int rearrange_squash(struct repository *r);
  
- extern const char sign_off_header[];
- 
 -void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
 -void append_conflicts_hint(struct strbuf *msgbuf);
 +/*
 + * Append a signoff to the commit message in "msgbuf". The ignore_footer
 + * parameter specifies the number of bytes at the end of msgbuf that should
 + * not be considered at all. I.e., they are not checked for existing trailers,
 + * and the new signoff will be spliced into the buffer before those bytes.
 + */
 +void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
 +
 +void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
  int message_is_empty(const struct strbuf *sb,
  		     enum commit_msg_cleanup_mode cleanup_mode);
  int template_untouched(const struct strbuf *sb, const char *template_file,