mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
76638d90e8
Use the i18n-specific test functions in test scripts for git-apply.
This issue was was introduced in the following commits:
de373 i18n: apply: mark parseopt strings for translation
3638e i18n: apply: mark strings for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
39 lines
714 B
Bash
Executable File
39 lines
714 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Andreas Gruenbacher
|
|
#
|
|
|
|
test_description='git apply filename consistency check'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
cat > bad1.patch <<EOF &&
|
|
diff --git a/f b/f
|
|
new file mode 100644
|
|
index 0000000..d00491f
|
|
--- /dev/null
|
|
+++ b/f-blah
|
|
@@ -0,0 +1 @@
|
|
+1
|
|
EOF
|
|
cat > bad2.patch <<EOF
|
|
diff --git a/f b/f
|
|
deleted file mode 100644
|
|
index d00491f..0000000
|
|
--- b/f-blah
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-1
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'apply diff with inconsistent filenames in headers' '
|
|
test_must_fail git apply bad1.patch 2>err &&
|
|
test_i18ngrep "inconsistent new filename" err &&
|
|
test_must_fail git apply bad2.patch 2>err &&
|
|
test_i18ngrep "inconsistent old filename" err
|
|
'
|
|
|
|
test_done
|