@matheusbsbs / matheus-bagliano / commits / 4fe7e43c53
Fork 0

rebase: fix saving of --signoff state for am-based rebases

This was an error introduced in the conversion from shell in commit 21853626eac5 ("built-in rebase: call `git am` directly", 2019-01-18), which was noticed by a random browsing of the code. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Dec 20, 2019 at 18:53 UTC 4fe7e43c53a6ad2948919503188bb2d34ce02fa9
1 file changed +1 -1
builtin/rebase.c
+1 -1
@@ -685,7 +685,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)
685 write_file(state_dir_path("gpg_sign_opt", opts), "%s",
686 opts->gpg_sign_opt);
687 if (opts->signoff)
688 - write_file(state_dir_path("strategy", opts), "--signoff");
688 + write_file(state_dir_path("signoff", opts), "--signoff");
689
690 return 0;
691 }