diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:56 -0700 |
| commit | 3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89 (patch) | |
| tree | 68475f052dca99cd0943686fc1ce9dd3043049a9 /sequencer.h | |
| parent | f13710e32e69fd267c61035731af61913db2060b (diff) | |
| parent | 4c063c82e9611ffd31353ababa96a0a39d9d7d85 (diff) | |
| download | git-3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89.tar.gz | |
Merge branch 'pw/rebase-i-error-message' into maint-2.45
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); |