From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Nov 2020 21:32:53 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-api-null-impl'
X-Git-Tag: v2.30.0-rc0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1f95951efc55c97477e32287b06e204553be5c2;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-api-null-impl'

Preparation for a new merge strategy.

* en/merge-ort-api-null-impl:
  merge,rebase,revert: select ort or recursive by config or environment
  fast-rebase: demonstrate merge-ort's API via new test-tool command
  merge-ort-wrappers: new convience wrappers to mimic the old merge API
  merge-ort: barebones API of new merge strategy with empty implementation
---

a1f95951efc55c97477e32287b06e204553be5c2
diff --cc sequencer.c
index 3dce6c963c,6b6c15c357..221e98721d
--- a/sequencer.c
+++ b/sequencer.c
@@@ -314,7 -329,10 +329,8 @@@ int sequencer_remove_state(struct repla
  		}
  	}
  
 -	free(opts->committer_name);
 -	free(opts->committer_email);
  	free(opts->gpg_sign);
+ 	free(opts->default_strategy);
  	free(opts->strategy);
  	for (i = 0; i < opts->xopts_nr; i++)
  		free(opts->xopts[i]);