mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/t3404-one-shot-export-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-07-24 14:50:49 -07:00
parent 284b444932 650161a277
commit 18a86f32ab
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t3404-rebase-interactive.sh
View File

@ -264,11 +264,18 @@ test_expect_success 'retain authorship' '
' '
test_expect_success 'retain authorship w/ conflicts' ' 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 && git reset --hard twerp &&
test_commit a conflict a conflict-a && test_commit a conflict a conflict-a &&
git reset --hard twerp && git reset --hard twerp &&
GIT_AUTHOR_NAME=AttributeMe \
GIT_AUTHOR_NAME=AttributeMe &&
export GIT_AUTHOR_NAME &&
test_commit b conflict b conflict-b && test_commit b conflict b conflict-b &&
GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
set_fake_editor && set_fake_editor &&
test_must_fail git rebase -i conflict-a && test_must_fail git rebase -i conflict-a &&
echo resolved >conflict && echo resolved >conflict &&