diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-21 00:45:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-21 00:45:15 +0200 |
| commit | 83ac567781b53f7101c2a9b44462df447bbdc2c6 (patch) | |
| tree | db5bbfa1a13643877b760179e70ceda0a2e310b2 /sequencer.h | |
| parent | Merge branch 'ds/ahead-behind-fix' (diff) | |
| parent | rebase -i: improve error message when picking merge (diff) | |
| download | git-83ac567781b53f7101c2a9b44462df447bbdc2c6.tar.xz git-83ac567781b53f7101c2a9b44462df447bbdc2c6.zip | |
Merge branch 'pw/rebase-i-error-message'
When the user adds to "git rebase -i" instruction to "pick" a merge
commit, the error experience is not pleasant. Such an error is now
caught earlier in the process that parses the todo list.
* pw/rebase-i-error-message:
rebase -i: improve error message when picking merge
rebase -i: pass struct replay_opts to parse_insn_line()
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.h b/sequencer.h index a309ddd712..304ba4b4d3 100644 --- a/sequencer.h +++ b/sequencer.h @@ -136,8 +136,8 @@ struct todo_list { .buf = STRBUF_INIT, \ } -int todo_list_parse_insn_buffer(struct repository *r, char *buf, - struct todo_list *todo_list); +int todo_list_parse_insn_buffer(struct repository *r, struct replay_opts *opts, + char *buf, struct todo_list *todo_list); int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list, const char *file, const char *shortrevisions, const char *shortonto, int num, unsigned flags); |