diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:12 (GMT) |
| commit | 5c8c0a0d78b0e0ee50ba13823f0cfbee05334461 (patch) | |
| tree | 8b4ebc4676440e47f24351824e16a072796772d1 /sequencer.h | |
| parent | b75ba9bbd13877ff3351e150d3d053baec81f0db (diff) | |
| parent | 4627bc777e9ade5e3a85d6b8e8630fc4b6e2f8f6 (diff) | |
| download | git-5c8c0a0d78b0e0ee50ba13823f0cfbee05334461.zip git-5c8c0a0d78b0e0ee50ba13823f0cfbee05334461.tar.gz git-5c8c0a0d78b0e0ee50ba13823f0cfbee05334461.tar.bz2 | |
Merge branch 'pw/post-commit-from-sequencer'
"rebase -i" ceased to run post-commit hook by mistake in an earlier
update, which has been corrected.
* pw/post-commit-from-sequencer:
sequencer: run post-commit hook
move run_commit_hook() to libgit and use it there
sequencer.h fix placement of #endif
t3404: remove uneeded calls to set_fake_editor
t3404: set $EDITOR in subshell
t3404: remove unnecessary subshell
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sequencer.h b/sequencer.h index 574260f..9f9ae29 100644 --- a/sequencer.h +++ b/sequencer.h @@ -202,11 +202,10 @@ void print_commit_summary(struct repository *repo, int read_author_script(const char *path, char **name, char **email, char **date, int allow_missing); -#endif - void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, struct commit *onto, const char *orig_head); void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); +#endif /* SEQUENCER_H */ |