Commit Diff

Commit:
95ad1e7d029b71d685721849684902a9e033e824
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
don't undef GOT_AUTHOR in regress unset only in the subshell so further cose is unaffected. ok stsp@
Actions:
Patch | Tree
commit - 1f2400920021a8450f259800cd05616878ad2733
commit + 95ad1e7d029b71d685721849684902a9e033e824
blob - 49bc14114f03d5598c9603ce6725550df0f5b9dc
blob + ead30c929edf2310158a6582d4f9f9410bbdb820
--- regress/cmdline/rebase.sh
+++ regress/cmdline/rebase.sh
@@ -1600,8 +1600,9 @@ test_rebase_no_author_info() {
 		return 1
 	fi
 
-	unset GOT_AUTHOR
-	(cd $testroot/wt && got rebase newbranch > $testroot/stdout)
+	# unset in a subshell to avoid affecting our environment
+	(unset GOT_AUTHOR && cd $testroot/wt && \
+		got rebase newbranch > $testroot/stdout)
 
 	(cd $testroot/repo && git checkout -q newbranch)
 	local new_commit1=`git_show_parent_commit $testroot/repo`