diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:49 -0700 |
| commit | 18a86f32ab91a0be390508c0b3cdc374a00822a0 (patch) | |
| tree | 71e5412caf1c4398c7eb09657706555908bbd734 | |
| parent | 284b4449323778b4d92786969e0f922b9bfd8bdf (diff) | |
| parent | 650161a27782fe545dfe0efcb1ad971c1aebc8de (diff) | |
Merge branch 'jc/t3404-one-shot-export-fix'
Correct a broken use of "VAR=VAL shell_func" in a test.
* 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 c5d39e2b23..01616901bd 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 && |