# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1188556823 -7200
# Node ID 89696e71bd8919094261796ca21096dc92f42836
# Parent  6e0f05f6f68d2165069cd67bc558593a0dc61416# Parent  5c2ca6d6ab21a14312904b07a00e96f5818ea53f
merge with crew-stable

diff --git a/tests/test-convert-git b/tests/test-convert-git
--- a/tests/test-convert-git
+++ b/tests/test-convert-git
@@ -7,12 +7,12 @@ echo "convert=" >> $HGRCPATH
 
 mkdir git-repo
 cd git-repo
-git init
+git init-db >/dev/null 2>/dev/null
 echo a > a
 git add a
-git commit -m t1 > /dev/null || echo "git commit error"
+git commit -m t1 >/dev/null 2>/dev/null || echo "git commit error"
 echo b >> a
-git commit -a -m t2 > /dev/null || echo "git commit error"
+git commit -a -m t2 >/dev/null || echo "git commit error"
 cd ..
 
 hg convert git-repo
diff --git a/tests/test-convert-git.out b/tests/test-convert-git.out
--- a/tests/test-convert-git.out
+++ b/tests/test-convert-git.out
@@ -1,4 +1,3 @@
-Initialized empty Git repository in .git/
 assuming destination git-repo-hg
 initializing destination git-repo-hg repository
 scanning source...