From: Elijah Newren <newren@gmail.com>
Date: Fri, 20 Dec 2019 18:53:56 +0000 (+0000)
Subject: rebase: fix saving of --signoff state for am-based rebases
X-Git-Tag: v2.25.0-rc1~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fe7e43c53a6ad2948919503188bb2d34ce02fa9;p=thirdparty%2Fgit.git

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>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4a20582e72..86f869c021 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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;
 }