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 /builtin/rebase.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 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index c468828189..67c0352bf8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -299,7 +299,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) oid_to_hex(&opts->restrict_revision->object.oid)); ret = sequencer_make_script(the_repository, &todo_list.buf, - &make_script_args, flags); + make_script_args.nr, make_script_args.v, + flags); if (ret) { error(_("could not generate todo list")); goto cleanup; |