Merge branch 'en/sequencer-rollback-lock-cleanup'

Code clean-up.

* en/sequencer-rollback-lock-cleanup:
  sequencer: remove duplicate rollback_lock_file() call

diff --cc sequencer.c
index c35810029941f9a4962f6622115918e1c906b7fb,935860a5c43e37a0e9ee99ceb9f5ea074ff8d5db..a65d7a6b7cd94652436b3d14256464ffbbc224a5
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -3683,15 -3565,13 +3683,14 @@@ static int do_merge(struct repository *
  
                /* Add the tips to be merged */
                for (j = to_merge; j; j = j->next)
 -                      argv_array_push(&cmd.args,
 -                                      oid_to_hex(&j->item->object.oid));
 +                      strvec_push(&cmd.args,
 +                                  oid_to_hex(&j->item->object.oid));
  
                strbuf_release(&ref_name);
 -              unlink(git_path_cherry_pick_head(r));
 +              refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
 +                              NULL, 0);
                rollback_lock_file(&lock);
  
-               rollback_lock_file(&lock);
                ret = run_command(&cmd);
  
                /* force re-reading of the cache */