From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:44 +0000 (-0800)
Subject: Merge branch 'en/sequencer-rollback-lock-cleanup'
X-Git-Tag: v2.30.0-rc0~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3e63abb279dbd501459169b1156ea78765e3d3e;p=thirdparty%2Fgit.git

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

Code clean-up.

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

f3e63abb279dbd501459169b1156ea78765e3d3e
diff --cc sequencer.c
index c358100299,935860a5c4..a65d7a6b7c
--- a/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 */