# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1634691967 25200
# Node ID fd3d4b7f8e62ef7aa883b83417705eb6a444e2d9
# Parent  96aa3a68d3b5973e31cd03d2105a2e99b62e6bc4
tests: fix test-convert-git to work w/ "git pull" requiring strategy

A recent change to git (031e2f7ae195) made it an error to not specify a strategy
(`--rebase`, `--no-rebase`, `--ff-only`), instead of just the warning it was
previously. As far as I can tell, `--no-rebase` is the behavior we were getting
before, and the only one that makes the test work.

Differential Revision: https://phab.mercurial-scm.org/D11714

diff -r 96aa3a68d3b5 -r fd3d4b7f8e62 tests/test-convert-git.t
--- a/tests/test-convert-git.t	Thu Oct 21 17:25:41 2021 +0200
+++ b/tests/test-convert-git.t	Tue Oct 19 18:06:07 2021 -0700
@@ -50,7 +50,7 @@
   $ echo a >> a
   $ commit -a -m t4.2
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit . other > /dev/null 2>/dev/null
+  $ git pull --no-commit . other --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Merge branch other'
   $ cd ..
   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \
@@ -137,7 +137,7 @@
   $ git add baz
   $ commit -a -m 'add baz'
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
+  $ git pull --no-commit . Bar Baz --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Octopus merge'
   $ echo bar >> bar
   $ commit -a -m 'change bar'
@@ -145,7 +145,7 @@
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout master >/dev/null 2>/dev/null
-  $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
+  $ git pull --no-commit -s ours . Foo --no-rebase > /dev/null 2>/dev/null
   $ commit -m 'Discard change to foo'
   $ cd ..
   $ glog()