Mercurial > hg

diff tests/test-convert-git.t @ 26047:d9d3d49c4cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Aug 2015 18:38:56 -0500
parents a7527c5769bb 97208371715a
children e63d05fbae84
line wrap: on
line diff
--- a/tests/test-convert-git.t	Fri Aug 14 15:30:52 2015 +0900
+++ b/tests/test-convert-git.t	Tue Aug 18 18:38:56 2015 -0500
@@ -656,10 +656,12 @@
   $ git init git-repo7
   Initialized empty Git repository in $TESTTMP/git-repo7/.git/
   $ cd git-repo7
-  $ touch a && git add a && git commit -am "commit a"
+TODO: it'd be nice to use (?) lines instead of grep -v to handle the
+git output variance, but that doesn't currently work in the middle of
+a block, so do this for now.
+  $ touch a && git add a && git commit -am "commit a" | grep -v changed
   [master (root-commit) 8ae5f69] commit a
    Author: nottest <test@example.org>
-   1 file changed, 0 insertions(+), 0 deletions(-)
    create mode 100644 a
   $ cd ..
   $ git clone git-repo7 git-repo7-client