diff options
| author | Elijah Newren <newren@gmail.com> | 2019-12-20 18:53:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-20 19:29:49 (GMT) |
| commit | 4fe7e43c53a6ad2948919503188bb2d34ce02fa9 (patch) | |
| tree | e5a4a4a69126599c5352f644668e61e857a02d1d | |
| parent | 53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff) | |
| download | git-4fe7e43c53a6ad2948919503188bb2d34ce02fa9.zip git-4fe7e43c53a6ad2948919503188bb2d34ce02fa9.tar.gz git-4fe7e43c53a6ad2948919503188bb2d34ce02fa9.tar.bz2 | |
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>
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 4a20582..86f869c 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; } |