commit 7370f8029cdaf59e59f78cfc866eeb7b82c76e74 from: Omar Polo date: Sun Jul 24 13:58:38 2022 UTC use GOT_IGNORE_GITCONFIG in regress fixes test_rebase_no_author_info when a valid ~/.gitconfig is found. ok stsp@ commit - 4fa16b393ac52eadd8159d265e31961b11a10a25 commit + 7370f8029cdaf59e59f78cfc866eeb7b82c76e74 blob - bd32f96c5071b834cc2b1478703442467b2cbfca blob + 98c2c07a14f46473a38a3a8a4e3118a018b05d80 --- 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 - 26f717faa35b5906f8abb7c9f459f633ebaa09dc blob + 09788e37096319afffa06cca64d7a215c112d476 --- 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