Commit Diff

Commit:
1f2400920021a8450f259800cd05616878ad2733
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
use GOT_IGNORE_GITCONFIG in regress fixes test_rebase_no_author_info when a valid ~/.gitconfig is found. ok stsp@
Actions:
Patch | Tree
commit - 7e91f3d2e1322160a4db79cd753888592c6fbf18
commit + 1f2400920021a8450f259800cd05616878ad2733
blob - 0b4639fa3e8e24f15cdb9d5e73a2334215eccff6
blob + c46aff5002a8e5c93a065ef3fc1e94a0c88f89ed
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
@@ -901,7 +901,10 @@ test_commit_gitconfig_author() {
 	(cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
 
 	echo "modified alpha" > $testroot/wt/alpha
-	(cd $testroot/wt && got commit -m 'test gitconfig author' > /dev/null)
+
+	# unset in a subshell to avoid affecting our environment
+	(unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
+		 got commit -m 'test gitconfig author' > /dev/null)
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		test_done "$testroot" "$ret"
blob - 2a5f020704ba0327fb8f98a3b3fd6d02b1c49edc
blob + f1be0f27a2a9c32efd6615dcb1bcb7ac413d4fd2
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
@@ -23,6 +23,7 @@ export GOT_AUTHOR_8="flan_hac"
 export GOT_AUTHOR_11="flan_hacker"
 export GOT_LOG_DEFAULT_LIMIT=0
 export GOT_TEST_ROOT="/tmp"
+export GOT_IGNORE_GITCONFIG=1
 
 export MALLOC_OPTIONS=S