Thread (15 messages) 15 messages, 3 authors, 2019-10-15
STALE2449d
Revisions (2)
  1. v1 current
  2. v2 [diff vs current]

[PATCH 1/3] sequencer.h fix placement of #endif

From: Phillip Wood via GitGitGadget <hidden>
Date: 2019-10-10 18:36:54
Subsystem: the rest · Maintainer: Linus Torvalds

From: Phillip Wood <redacted>

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 <redacted>
---
 sequencer.h | 3 +--
 1 file changed, 1 insertion(+), 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 */
-- 
gitgitgadget
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help