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

Merge branch 'sg/t6050-failing-editor-test-fix'

Browse Source 
* sg/t6050-failing-editor-test-fix:
  t6050-replace: make failing editor test more robust
This commit is contained in:
Junio C Hamano
2016-01-20 11:43:31 -08:00
parent 108cb77c86 36fc7d8a79
commit 1576f78342
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t6050-replace.sh
View File

@ -351,11 +351,15 @@ test_expect_success 'test --format long' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'setup a fake editor' ' test_expect_success 'setup fake editors' '
write_script fakeeditor <<-\EOF write_script fakeeditor <<-\EOF &&
sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new" sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
mv "$1.new" "$1" mv "$1.new" "$1"
EOF EOF
write_script failingfakeeditor <<-\EOF
./fakeeditor "$@"
false
EOF
' '
test_expect_success '--edit with and without already replaced object' ' test_expect_success '--edit with and without already replaced object' '
@ -372,7 +376,7 @@ test_expect_success '--edit with and without already replaced object' '
test_expect_success '--edit and change nothing or command failed' ' test_expect_success '--edit and change nothing or command failed' '
git replace -d "$PARA3" && git replace -d "$PARA3" &&
test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" && test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
test_must_fail env GIT_EDITOR="./fakeeditor;false" git replace --edit "$PARA3" && test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" && GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
git replace -l | grep "$PARA3" && git replace -l | grep "$PARA3" &&
git cat-file commit "$PARA3" | grep "A fake Thor" git cat-file commit "$PARA3" | grep "A fake Thor"