diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:54:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:54:55 -0700 |
| commit | f44a7442f6abeea0059fae46ce482b0c49c27de1 (patch) | |
| tree | 2c3cf2b55d59ac3f7efa22264e846092171a9a41 | |
| parent | Second batch for 2.19 cycle (diff) | |
| parent | t3404: fix use of "VAR=VAL cmd" with a shell function (diff) | |
| download | tgif-f44a7442f6abeea0059fae46ce482b0c49c27de1.tar.xz | |
Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export
* jc/t3404-one-shot-export-fix:
t3404: fix use of "VAR=VAL cmd" with a shell function
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 352a52e59d..449401e859 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -264,11 +264,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 && |