diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/rebase-interactive.h | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/rebase-interactive.h')
| -rw-r--r-- | third_party/git/rebase-interactive.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/third_party/git/rebase-interactive.h b/third_party/git/rebase-interactive.h index dc2cf0ee122c..44dbb06311a8 100644 --- a/third_party/git/rebase-interactive.h +++ b/third_party/git/rebase-interactive.h @@ -5,17 +5,12 @@ struct strbuf; struct repository; struct todo_list; -void append_todo_help(int command_count, +void append_todo_help(unsigned keep_empty, int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf); int edit_todo_list(struct repository *r, struct todo_list *todo_list, struct todo_list *new_todo, const char *shortrevisions, const char *shortonto, unsigned flags); - int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); -int todo_list_check_against_backup(struct repository *r, - struct todo_list *todo_list); - -int check_todo_list_from_file(struct repository *r); #endif |