Skip to contentSkip to conversation

Default GIT_MERGE_VERBOSITY to 5 during tests.

PATCH In review Shawn O. Pearce 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore

Shawn O. Pearce

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 t/test-lib.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
t/test-lib.sh +2 -0
index 8e3ee6c..37822fc 100755
@@ -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
Signature · 1 line
1.5.0.rc3.22.g5057