# HG changeset patch # User Matt Harbison # Date 2015-07-02 00:53:12 # Node ID 5b9b70635423532b569afce266290b9c724ee9f0 # Parent bd2e171d023b2d673c310e6ca902282c49eff15d 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 - 1 file changed, 3 insertions(+) + 1 files changed, 3 insertions(+), 0 deletions(-) $ cd .. $ hg convert git-repo6 hg-repo6 initializing destination hg-repo6 repository 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 @@ -465,10 +465,7 @@ test non-tab whitespace .gitmodules > path = git-repo5 > url = $TESTTMP/git-repo5 > EOF - $ git commit -a -m "weird white space submodule" - [master *] weird white space submodule (glob) - Author: nottest - 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 @@ test missing .gitmodules $ git checkout HEAD .gitmodules $ git rm .gitmodules rm '.gitmodules' - $ git commit -m "remove .gitmodules" .gitmodules - [master *] remove .gitmodules (glob) - Author: nottest - 1 file changed, 3 deletions(-) - delete mode 100644 .gitmodules - $ git commit -m "missing .gitmodules" - [master *] missing .gitmodules (glob) - Author: nottest - 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)