From 868b8b6de1440fba557fcce2f2a010a6360a8d01 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 19 Jun 2020 12:36:35 +0300
Subject: 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.
---
 tests/release.testscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/release.testscript')

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"'
 
-- 
cgit v1.1