[PATCH 2 of 2] test-convert-git: drop a git warning that doesn't occur on Windows
Matt Harbison
mharbison72 at gmail.com
Sun Nov 15 21:53:25 CST 2015
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1447643483 18000
# Sun Nov 15 22:11:23 2015 -0500
# Node ID da079fdba7a61744c9eb2625bc9095e132361645
# Parent 9f300d76e9270344fbb9ec4a04203608380d8a98
test-convert-git: drop a git warning that doesn't occur on Windows
I do see this on Linux with 1.7.7.6, but not on Windows with 1.9.5.msysgit.0.
Adding a (?) didn't work to conditionally ignore the line; I'm not sure if the
(glob) interferes with that.
diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -533,8 +533,7 @@
$ git commit -q -m "remove .gitmodules" .gitmodules
$ git commit -q -m "missing .gitmodules"
$ cd ..
- $ hg convert git-repo6 hg-repo6 --traceback
- fatal: Path '.gitmodules' does not exist in '*' (glob)
+ $ hg convert git-repo6 hg-repo6 --traceback 2>&1 | grep -v "fatal: Path '.gitmodules' does not exist"
initializing destination hg-repo6 repository
scanning source...
sorting...
More information about the Mercurial-devel
mailing list