]> git.ipfire.org Git - thirdparty/git.git/commitdiff
rebase: fix saving of --signoff state for am-based rebases
authorElijah Newren <newren@gmail.com>
Fri, 20 Dec 2019 18:53:56 +0000 (18:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Dec 2019 19:29:49 +0000 (11:29 -0800)
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>
builtin/rebase.c

index 4a20582e724b00a565ee8b0fd05137a11b27568c..86f869c0218bb7acaad816053df81397b29880dc 100644 (file)
@@ -685,7 +685,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)
                write_file(state_dir_path("gpg_sign_opt", opts), "%s",
                           opts->gpg_sign_opt);
        if (opts->signoff)
-               write_file(state_dir_path("strategy", opts), "--signoff");
+               write_file(state_dir_path("signoff", opts), "--signoff");
 
        return 0;
 }