commit - 7370f8029cdaf59e59f78cfc866eeb7b82c76e74
commit + 1004841d7c8045b627768a441ebdb9c824d2134d
blob - 17e0a03100631d85b1f0e371cf6380a5c8c25fe3
blob + dbb9b29d4e5d2c9f64df51e0c6d0054bec81f6ff
--- regress/cmdline/rebase.sh
+++ regress/cmdline/rebase.sh
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`