mirror of
https://github.com/git/git.git
synced 2024-12-01 14:03:34 +08:00
c44a4c650c
This operation has quadratic complexity, which is especially painful on Windows, where shell scripts are *already* slow (mainly due to the overhead of the POSIX emulation layer). Let's reimplement this with linear complexity (using a hash map to match the commits' subject lines) for the common case; Sadly, the fixup/squash feature's design neglected performance considerations, allowing arbitrary prefixes (read: `fixup! hell` will match the commit subject `hello world`), which means that we are stuck with quadratic performance in the worst case. The reimplemented logic also happens to fix a bug where commented-out lines (representing empty patches) were dropped by the previous code. While at it, clarify how the fixup/squash feature works in `git rebase -i`'s man page. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.2 KiB
C
62 lines
1.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
|
|
};
|
|
|
|
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;
|
|
|
|
/* 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 }
|
|
|
|
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);
|
|
|
|
#endif
|