kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'va/i18n' 

A handful of tests that were broken under gettext-poison build have
been fixed.

* va/i18n:
  t7411: become resilient to GETTEXT_POISON
  t5520: become resilient to GETTEXT_POISON
  t3404: become resilient to GETTEXT_POISON
maint
Junio C Hamano 2016-08-17 14:07:45 -07:00
parent 7c5543115e 3126732e39
commit a6711ed714
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1286,7 +1286,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '
set_fake_editor && set_fake_editor &&
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \ FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
>out 2>err && >out 2>err &&
grep "$SQ-S\"S I Gner\"$SQ" err test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
' '


test_done test_done

4
t/t5520-pull.sh
View File

@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '
test_tick && test_tick &&
git commit -m "Create conflict" seq.txt && git commit -m "Create conflict" seq.txt &&
test_must_fail git pull --rebase . seq 2>err >out && test_must_fail git pull --rebase . seq 2>err >out &&
grep "When you have resolved this problem" out test_i18ngrep "When you have resolved this problem" out
' '


test_expect_success 'failed --rebase shows advice' ' test_expect_success 'failed --rebase shows advice' '
@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '
git checkout -f -b fails-to-rebase HEAD^ && git checkout -f -b fails-to-rebase HEAD^ &&
test_commit v2-without-cr file "2" file2-lf && test_commit v2-without-cr file "2" file2-lf &&
test_must_fail git pull --rebase . diverging 2>err >out && test_must_fail git pull --rebase . diverging 2>err >out &&
grep "When you have resolved this problem" out test_i18ngrep "When you have resolved this problem" out
' '


test_expect_success '--rebase fails with multiple branches' ' test_expect_success '--rebase fails with multiple branches' '

2
t/t7411-submodule-config.sh
View File

@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
HEAD b \ HEAD b \
HEAD submodule \ HEAD submodule \
2>actual_err && 2>actual_err &&
grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
) )
' '