tests: update test to work with Git 2.16
authorGregory Szorc <gregory.szorc@gmail.com>
Mon, 22 Jan 2018 12:38:04 -0800
changeset 35786 8144f1b07e21
parent 35785 ba15580e53d5
child 35787 a84dbc87dae9
tests: update test to work with Git 2.16 It looks like Git 2.16 removed the "..." from some strings. Glob over those characters in the test output. Differential Revision: https://phab.mercurial-scm.org/D1935
tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t	Sat Jan 20 13:41:57 2018 -0800
+++ b/tests/test-subrepo-git.t	Mon Jan 22 12:38:04 2018 -0800
@@ -320,7 +320,7 @@
   $ hg up
   From $TESTTMP/tb/s
    * [new branch]      b2         -> origin/b2
-  Previous HEAD position was f47b465... merge
+  Previous HEAD position was f47b465* merge (glob)
   Switched to a new branch 'b2'
   pulling subrepo s from $TESTTMP/tb/s
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -572,8 +572,8 @@
   $ cd ..
   $ cd s
   $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
-  Previous HEAD position was 32a3438... fff
-  HEAD is now at aa84837... f
+  Previous HEAD position was 32a3438* fff (glob)
+  HEAD is now at aa84837* f (glob)
   $ cd ..
   $ hg update 1
    subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1)
@@ -623,11 +623,11 @@
 Test subrepo already at intended revision:
   $ cd s
   $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc
-  HEAD is now at 32a3438... fff
+  HEAD is now at 32a3438* fff (glob)
   $ cd ..
   $ hg update 1
-  Previous HEAD position was 32a3438... fff
-  HEAD is now at da5f5b1... g
+  Previous HEAD position was 32a3438* fff (glob)
+  HEAD is now at da5f5b1* g (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1