Skip to content

Commit

Permalink
rebase: fix saving of --signoff state for am-based rebases
Browse files Browse the repository at this point in the history
This was an error introduced in the conversion from shell in commit
2185362 ("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>
  • Loading branch information
newren authored and gitster committed Dec 20, 2019
1 parent 53a06cf commit 4fe7e43
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/rebase.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 4fe7e43

Please sign in to comment.