[PATCH] test-convert-git: use a relative gitmodule url

Matt Harbison mharbison72 at gmail.com
Wed Jul 1 23:13:46 CDT 2015


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1435809848 14400
#      Thu Jul 02 00:04:08 2015 -0400
# Node ID f6e29d51db0933bc4aea8183adbdf70bafd4169c
# Parent  3193bcd6f47a2b9be7a00447fefd69de26530f18
test-convert-git: use a relative gitmodule url

The absolute URL was causing this error with 1.9.5 on Windows, which had a
cascading effect:

  @@ -466,22 +466,24 @@
     >   url = $TESTTMP/git-repo5
     > EOF
     $ git commit -a -m "weird white space submodule"
  -  [master *] weird white space submodule (glob)
  -   Author: nottest <test at example.org>
  -   1 file changed, 3 insertions(+)
  +  fatal: bad config file line 6 in $TESTTMP/git-repo6/.gitmodules
  +  [128]
     $ cd ..
     $ hg convert git-repo6 hg-repo6
     initializing destination hg-repo6 repository
     scanning source...

For reasons unknown, there is still this delta on Windows:

  @@ -490,7 +490,6 @@
     $ git commit -q -m "missing .gitmodules"
     $ cd ..
     $ hg convert git-repo6 hg-repo6 --traceback
  -  fatal: Path '.gitmodules' does not exist in '*' (glob)
     initializing destination hg-repo6 repository
     scanning source...
     sorting...

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
@@ -463,7 +463,7 @@
   $ cat >> .gitmodules <<EOF
   > [submodule "git-repo5"]
   >   path = git-repo5
-  >   url = $TESTTMP/git-repo5
+  >   url = git-repo5
   > EOF
   $ git commit -q -a -m "weird white space submodule"
   $ cd ..


More information about the Mercurial-devel mailing list