From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2021 00:43:31 +0000 (-0800)
Subject: Merge branch 'ah/rebase-no-fork-point-config'
X-Git-Tag: v2.31.0-rc0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=682bbad64d9afd438d9b293c18331c1018672fee;p=thirdparty%2Fgit.git

Merge branch 'ah/rebase-no-fork-point-config'

"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.

* ah/rebase-no-fork-point-config:
  rebase: add a config option for --no-fork-point
---

682bbad64d9afd438d9b293c18331c1018672fee
diff --cc t/t3431-rebase-fork-point.sh
index 2dab893c75,2d07bd9fd2..4c98d99e7e
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@@ -29,6 -26,19 +29,19 @@@ test_expect_success setup 
  	test_commit G
  '
  
+ do_test_rebase () {
+ 	expected="$1" &&
+ 	shift &&
 -	git checkout master &&
++	git checkout main &&
+ 	git reset --hard E &&
+ 	git checkout side &&
+ 	git reset --hard G &&
+ 	git rebase $* &&
+ 	test_write_lines $expected >expect &&
+ 	git log --pretty=%s >actual &&
+ 	test_cmp expect actual
+ }
+ 
  test_rebase () {
  	expected="$1" &&
  	shift &&