summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2019-10-15 10:25:30 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-16 10:30:51 +0900
commit12bb7a540a39746fd6f62e4d5ffd016a2178bcf7 (patch)
tree5841778d0932e7160fe5bbf9345e4fa4ad763f9f
parentt3404: remove uneeded calls to set_fake_editor (diff)
downloadtgif-12bb7a540a39746fd6f62e4d5ffd016a2178bcf7.tar.xz
sequencer.h fix placement of #endif
Commit 65850686cf ("rebase -i: rewrite write_basic_state() in C", 2018-08-28) accidentially added new function declarations after the #endif at the end of the include guard. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--sequencer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sequencer.h b/sequencer.h
index 0c494b83d4..ac66892d71 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -195,11 +195,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 sequencer_get_last_command(struct repository* r,
enum replay_action *action);
+#endif /* SEQUENCER_H */