Junio C Hamano <gitster@xxxxxxxxx> writes: >>> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh >>> index 7e9f375a24..fd43443ff5 100755 >>> --- a/t/t3404-rebase-interactive.sh >>> +++ b/t/t3404-rebase-interactive.sh >>> @@ -280,8 +280,11 @@ test_expect_success 'retain authorship w/ conflicts' ' >>> git reset --hard twerp && >>> test_commit a conflict a conflict-a && >>> git reset --hard twerp && >>> - GIT_AUTHOR_NAME=AttributeMe \ >>> + oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME && >>> + GIT_AUTHOR_NAME=AttributeMe && >>> + export GIT_AUTHOR_NAME && >>> test_commit b conflict b conflict-b && >>> + GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME && >> >> ...would you want to use test_when_finished here (both for robustness, >> but also to make it more clear to a reader what's going on)? > > Perhaps. Yes, but this one ends up to be overly ugly. The restoreing of the AUTHOR_NAME must be done not just before this test_expect_success finishes and control goes on to the next test, but also before "git rebase -i" in the middle of this test that is expected to fail with conflict, as we want it to see the original author name (not the modified AttributeMe name). t/t3404-rebase-interactive.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 481a350090..489b6196e0 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -256,11 +256,18 @@ test_expect_success 'retain authorship' ' ' test_expect_success 'retain authorship w/ conflicts' ' + oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME && + test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" && + git reset --hard twerp && test_commit a conflict a conflict-a && git reset --hard twerp && - GIT_AUTHOR_NAME=AttributeMe \ + + GIT_AUTHOR_NAME=AttributeMe && + export GIT_AUTHOR_NAME && test_commit b conflict b conflict-b && + GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME && + set_fake_editor && test_must_fail git rebase -i conflict-a && echo resolved >conflict &&
