development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-19 08:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export

Browse source 
* 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-16 14:54:55 -07:00
parent e3331758f1 650161a277
commit f44a7442f6
1 changed files with 8 additions and 1 deletions
Show stats 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' '
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 &&