From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 4 Feb 2007 05:45:47 +0000 (-0500)
Subject: Default GIT_MERGE_VERBOSITY to 5 during tests.
X-Git-Tag: v1.5.0-rc4~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d0fc48f27304ac1bc7abf802ec53fe66fedb15a;p=git.git

Default GIT_MERGE_VERBOSITY to 5 during tests.

Its really nice to be able to run a test with -v and automatically
see the "debugging" dump from merge-recursive, especially if we
are actually trying to debug merge-recursive.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8e3ee6cd7..37822fc13 100755
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -30,6 +30,8 @@ unset GIT_INDEX_FILE
 unset GIT_OBJECT_DIRECTORY
 unset SHA1_FILE_DIRECTORIES
 unset SHA1_FILE_DIRECTORY
+GIT_MERGE_VERBOSITY=5
+export GIT_MERGE_VERBOSITY
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 export EDITOR VISUAL