Mercurial > hg > hg-git

changeset 303:126ce54030f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: specify --pretty format If the user sets git config --global format.pretty, all hell breaks loose. Specifying it prevents this.
author Tay Ray Chuan <rctay89@gmail.com>
date Sun, 28 Mar 2010 12:21:48 +0800
parents 7ddb740ac7cc
children 60acfbd75382 7dfe8be21135 af8d8fbc8025 a8b34be04b6a
files tests/test-empty-working-tree tests/test-encoding tests/test-file-removal tests/test-merge tests/test-octopus tests/test-tree-decomposition
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-empty-working-tree
+++ b/tests/test-empty-working-tree
@@ -54,7 +54,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log
+git log --pretty=medium
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-encoding
+++ b/tests/test-encoding
@@ -66,7 +66,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log
+git log --pretty=medium
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-file-removal
+++ b/tests/test-file-removal
@@ -80,7 +80,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log
+git log --pretty=medium
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-merge
+++ b/tests/test-merge
@@ -74,8 +74,8 @@
 cd ..
 cd gitrepo2
 echo % git log in repo pushed from hg
-git log master | sed 's/\.\.\.//g'
-git log beta | sed 's/\.\.\.//g'
+git log --pretty=medium master | sed 's/\.\.\.//g'
+git log --pretty=medium beta | sed 's/\.\.\.//g'
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-octopus
+++ b/tests/test-octopus
@@ -77,7 +77,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log | sed s/\\.\\.\\.//g
+git log --pretty=medium | sed s/\\.\\.\\.//g
 
 cd ..
 kill `cat gitdaemon.pid`
--- a/tests/test-tree-decomposition
+++ b/tests/test-tree-decomposition
@@ -71,7 +71,7 @@
 hg push git://localhost/gitrepo2
 
 cd ../gitrepo2
-git log
+git log --pretty=medium
 
 cd ..
 kill `cat gitdaemon.pid`