diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-23 07:32:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-23 07:32:57 -0700 |
| commit | 19b316ff3cc1ef6a8ffe59b60f057c450b2701b3 (patch) | |
| tree | 1b808625272f84571c18037b8a22051950b88314 /sequencer.c | |
| parent | Merge branch 'jk/setup-revisions-freefix' into next (diff) | |
| download | git-19b316ff3cc1ef6a8ffe59b60f057c450b2701b3.tar.gz git-19b316ff3cc1ef6a8ffe59b60f057c450b2701b3.zip | |
Revert "Merge branch 'jk/setup-revisions-freefix' into next"
This reverts commit b178f27e6ddfa8d515dcd445b6bf17119f962c44, reversing
changes made to 2d0aec78212bcdf7c7c067a74b471a9e0ce60adf.
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sequencer.c b/sequencer.c index 5476d39ba9..6d29a938aa 100644 --- a/sequencer.c +++ b/sequencer.c @@ -6052,8 +6052,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, return 0; } -int sequencer_make_script(struct repository *r, struct strbuf *out, - struct strvec *argv, unsigned flags) +int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, + const char **argv, unsigned flags) { char *format = NULL; struct pretty_print_context pp = {0}; @@ -6094,8 +6094,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, pp.fmt = revs.commit_format; pp.output_encoding = get_log_output_encoding(); - setup_revisions_from_strvec(argv, &revs, NULL); - if (argv->nr > 1) { + if (setup_revisions(argc, argv, &revs, NULL) > 1) { ret = error(_("make_script: unhandled options")); goto cleanup; } |