changeset 25721:5b9b70635423

test-convert-git: stablize for git 1.7.7.6 The output has apparently changed slightly since this version. Since they are just commits without any obvious importance to the test, and I can't figure out how to glob them away, silence them. Sample diffs were like this: @@ -468,7 +468,7 @@ $ git commit -a -m "weird white space submodule" [master *] weird white space submodule (glob) Author: nottest <test@example.org> - 1 file changed, 3 insertions(+) + 1 files changed, 3 insertions(+), 0 deletions(-) $ cd .. $ hg convert git-repo6 hg-repo6 initializing destination hg-repo6 repository
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 01 Jul 2015 20:53:12 -0400
parents bd2e171d023b
children eb15c5be381c
files tests/test-convert-git.t
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-git.t	Tue Jun 30 23:55:22 2015 -0700
+++ b/tests/test-convert-git.t	Wed Jul 01 20:53:12 2015 -0400
@@ -465,10 +465,7 @@
   >   path = git-repo5
   >   url = $TESTTMP/git-repo5
   > EOF
-  $ git commit -a -m "weird white space submodule"
-  [master *] weird white space submodule (glob)
-   Author: nottest <test@example.org>
-   1 file changed, 3 insertions(+)
+  $ git commit -q -a -m "weird white space submodule"
   $ cd ..
   $ hg convert git-repo6 hg-repo6
   initializing destination hg-repo6 repository
@@ -489,16 +486,8 @@
   $ git checkout HEAD .gitmodules
   $ git rm .gitmodules
   rm '.gitmodules'
-  $ git commit -m "remove .gitmodules" .gitmodules
-  [master *] remove .gitmodules (glob)
-   Author: nottest <test@example.org>
-   1 file changed, 3 deletions(-)
-   delete mode 100644 .gitmodules
-  $ git commit -m "missing .gitmodules"
-  [master *] missing .gitmodules (glob)
-   Author: nottest <test@example.org>
-   1 file changed, 1 insertion(+)
-   create mode 160000 git-repo4
+  $ 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)