git: update test for hg and git output changes
authorAugie Fackler <raf@durin42.com>
Wed, 25 Nov 2020 22:38:23 -0500
changeset 45926 a6f2821cdeab
parent 45925 6aacc39501f7
child 45927 926c7ed47ab0
git: update test for hg and git output changes Clearly nobody is running this in their CI. :( Differential Revision: https://phab.mercurial-scm.org/D9403
tests/test-git-interop.t
--- a/tests/test-git-interop.t	Wed Nov 25 22:23:23 2020 -0500
+++ b/tests/test-git-interop.t	Wed Nov 25 22:38:23 2020 -0500
@@ -67,8 +67,8 @@
 
 Without creating the .hg, hg status fails:
   $ hg status
-  abort: no repository found in '$TESTTMP/foo' (.hg not found)!
-  [255]
+  abort: no repository found in '$TESTTMP/foo' (.hg not found)
+  [10]
 But if you run hg init --git, it works:
   $ hg init --git
   $ hg id --traceback
@@ -304,14 +304,10 @@
   $ hg status
   heads mismatch, rebuilding dagcache
   M beta
-  $ git status
+  $ git status | egrep -v '^$|^  \(use '
   On branch master
   Changes not staged for commit:
-    (use "git add <file>..." to update what will be committed)
-    (use "git checkout -- <file>..." to discard changes in working directory)
-  
   	modified:   beta
-  
   no changes added to commit (use "git add" and/or "git commit -a")
 
 Contents of each commit should be the same