mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Phillip Wood](/assets/img/avatar_default.png)
The previous config handling relied on global variables, called git_default_config() even when the key had already been handled by git_sequencer_config() and did not initialize the diff configuration variables. Improve this by: i) loading the default values for message cleanup and gpg signing of commits into struct replay_opts; ii) restructuring the code to return immediately once a key is handled; and iii) calling git_diff_basic_config(). Note that unfortunately it is not possible to return early if the key is handled by git_gpg_config() as it does not indicate to the caller if the key has been handled or not. The sequencer should probably have been calling git_diff_basic_config() before as it creates a patch when there are conflicts. The shell version uses 'diff-tree' to create the patch so calling git_diff_basic_config() should match that. Although 'git commit' calls git_diff_ui_config() I don't think the output of print_commit_summary() is affected by anything that is loaded by that as print_commit_summary() always turns on rename detection so would ignore the value in the user's configuration anyway. The other values loaded by git_diff_ui_config() are about the formatting of patches so are not relevant to print_commit_summary(). Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
2.2 KiB
C
86 lines
2.2 KiB
C
#ifndef SEQUENCER_H
|
|
#define SEQUENCER_H
|
|
|
|
const char *git_path_seq_dir(void);
|
|
|
|
#define APPEND_SIGNOFF_DEDUP (1u << 0)
|
|
|
|
enum replay_action {
|
|
REPLAY_REVERT,
|
|
REPLAY_PICK,
|
|
REPLAY_INTERACTIVE_REBASE
|
|
};
|
|
|
|
enum commit_msg_cleanup_mode {
|
|
COMMIT_MSG_CLEANUP_SPACE,
|
|
COMMIT_MSG_CLEANUP_NONE,
|
|
COMMIT_MSG_CLEANUP_SCISSORS,
|
|
COMMIT_MSG_CLEANUP_ALL
|
|
};
|
|
|
|
struct replay_opts {
|
|
enum replay_action action;
|
|
|
|
/* Boolean options */
|
|
int edit;
|
|
int record_origin;
|
|
int no_commit;
|
|
int signoff;
|
|
int allow_ff;
|
|
int allow_rerere_auto;
|
|
int allow_empty;
|
|
int allow_empty_message;
|
|
int keep_redundant_commits;
|
|
int verbose;
|
|
|
|
int mainline;
|
|
|
|
char *gpg_sign;
|
|
enum commit_msg_cleanup_mode default_msg_cleanup;
|
|
|
|
/* Merge strategy */
|
|
char *strategy;
|
|
char **xopts;
|
|
size_t xopts_nr, xopts_alloc;
|
|
|
|
/* Only used by REPLAY_NONE */
|
|
struct rev_info *revs;
|
|
};
|
|
#define REPLAY_OPTS_INIT { -1 }
|
|
|
|
/* Call this to setup defaults before parsing command line options */
|
|
void sequencer_init_config(struct replay_opts *opts);
|
|
int sequencer_pick_revisions(struct replay_opts *opts);
|
|
int sequencer_continue(struct replay_opts *opts);
|
|
int sequencer_rollback(struct replay_opts *opts);
|
|
int sequencer_remove_state(struct replay_opts *opts);
|
|
|
|
int sequencer_make_script(int keep_empty, FILE *out,
|
|
int argc, const char **argv);
|
|
|
|
int transform_todo_ids(int shorten_ids);
|
|
int check_todo_list(void);
|
|
int skip_unnecessary_picks(void);
|
|
int rearrange_squash(void);
|
|
|
|
extern const char sign_off_header[];
|
|
|
|
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
|
|
void append_conflicts_hint(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,
|
|
enum commit_msg_cleanup_mode cleanup_mode);
|
|
int update_head_with_reflog(const struct commit *old_head,
|
|
const struct object_id *new_head,
|
|
const char *action, const struct strbuf *msg,
|
|
struct strbuf *err);
|
|
void commit_post_rewrite(const struct commit *current_head,
|
|
const struct object_id *new_head);
|
|
|
|
#define SUMMARY_INITIAL_COMMIT (1 << 0)
|
|
#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
|
|
void print_commit_summary(const char *prefix, const struct object_id *oid,
|
|
unsigned int flags);
|
|
#endif
|