diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:43 +0300 |
| commit | 73af6a4fab3fc570e234f5836dc1e59c3270a716 (patch) | |
| tree | ea53b35e93c552d780776e2d788559951369b462 /sequencer.c | |
| parent | 9879f3b3f6dc055099a045c67a1f086d60eb0200 (diff) | |
| parent | 43ad4f2eca811afe7eb2eb089afc9f501fd8a2c6 (diff) | |
Merge branch 'sc/sequencer-gpg-octopus'
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underlying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
* sc/sequencer-gpg-octopus:
t3435: add tests for rebase -r GPG signing
sequencer: pass explicit --no-gpg-sign to merge
sequencer: fix gpg option passed to merge subcommand
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index d76cbded00..c358100299 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3677,7 +3677,9 @@ static int do_merge(struct repository *r, strvec_push(&cmd.args, "-F"); strvec_push(&cmd.args, git_path_merge_msg(r)); if (opts->gpg_sign) - strvec_push(&cmd.args, opts->gpg_sign); + strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); + else + strvec_push(&cmd.args, "--no-gpg-sign"); /* Add the tips to be merged */ for (j = to_merge; j; j = j->next) |