Merge branch 'en/rebase-signoff-fix'

gitster · gitster · commit e0e1ac5db023 · 2020-01-02T12:38:30.000-08:00
"git rebase --signoff" stopped working when the command was written
in C, which has been corrected.

* en/rebase-signoff-fix:
  rebase: fix saving of --signoff state for am-based rebases
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -706,7 +706,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)`
`706`	`706`	`write_file(state_dir_path("gpg_sign_opt", opts), "%s",`
`707`	`707`	`opts->gpg_sign_opt);`
`708`	`708`	`if (opts->signoff)`
`709`		`- write_file(state_dir_path("strategy", opts), "--signoff");`
	`709`	`+ write_file(state_dir_path("signoff", opts), "--signoff");`
`710`	`710`
`711`	`711`	`return 0;`
`712`	`712`	`}`