Merge branch 'pb/ref-filter-with-crlf'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 00acb1249624398452eb60685b33c0ede344b9fe..a65d7a6b7cd94652436b3d14256464ffbbc224a5 100644 (file)
--- 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)
@@ -3689,7 +3691,6 @@ static int do_merge(struct repository *r,
                                NULL, 0);
                rollback_lock_file(&lock);
 
-               rollback_lock_file(&lock);
                ret = run_command(&cmd);
 
                /* force re-reading of the cache */
@@ -4478,7 +4479,7 @@ static int init_committer(struct replay_opts *opts)
        opts->committer_name =
                xmemdupz(id.name_begin, id.name_end - id.name_begin);
        opts->committer_email =
-               xmemdupz(id.mail_begin, id.mail_end - id.mail_end);
+               xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
 
        return 0;
 }