Browse Source

Merge branch 'en/rebase-signoff-fix'

"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
maint
Junio C Hamano 5 years ago
parent
commit
e0e1ac5db0
  1. 2
      builtin/rebase.c

2
builtin/rebase.c

@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) @@ -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;
}

Loading…
Cancel
Save