diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-19 12:36:35 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-19 12:36:52 +0300 |
| commit | 868b8b6de1440fba557fcce2f2a010a6360a8d01 (patch) | |
| tree | a022f5f2c2aef8bcd23cb388b90dae10bd87b339 | |
| parent | c153df0ee5547deca163e19cd902b1c5675d61fe (diff) | |
Fix git 2.27 warning when running tests
Starting version 2.27 git requires the divergent branch reconciliation method
to be specified explicitly for the pull command.
| -rw-r--r-- | tests/publish.testscript | 4 | ||||
| -rw-r--r-- | tests/release.testscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/publish.testscript b/tests/publish.testscript index fa32521..5428c3b 100644 --- a/tests/publish.testscript +++ b/tests/publish.testscript @@ -543,7 +543,7 @@ g = git -C prj >! 2>! # Push again into the build2-control branch from another local repository # (see above for details). # - $g2 pull; + $g2 pull --ff-only; $g2 commit --allow-empty -m 'Dummy2'; $g2 push; @@ -567,7 +567,7 @@ g = git -C prj >! 2>! # Note that the prj repository master branch pull fetches the # build2-control branch implicitly, so the subsequent publishing succeeds. # - $g pull; + $g pull --ff-only; $* 2>>~%EOE%; %package submission is queued(: \.*prj/1.0.14)?%d diff --git a/tests/release.testscript b/tests/release.testscript index 92c211b..c7f53f1 100644 --- a/tests/release.testscript +++ b/tests/release.testscript @@ -50,7 +50,7 @@ release += 2>! # gp2 = $g -C prj2 clone2 = $g clone prj.git prj2 &prj2/*** -pull2 = $gp2 pull +pull2 = $gp2 pull --ff-only fetch2 = $gp2 fetch log2 = $gp2 log '--pretty=format:"%d %s"' |