mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
65 lines
1.3 KiB
Bash
Executable file
65 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Andreas Gruenbacher
|
|
#
|
|
|
|
test_description='git apply filename consistency check'
|
|
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./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_grep "inconsistent new filename" err &&
|
|
test_must_fail git apply bad2.patch 2>err &&
|
|
test_grep "inconsistent old filename" err
|
|
'
|
|
|
|
test_expect_success 'apply diff with new filename missing from headers' '
|
|
cat >missing_new_filename.diff <<-\EOF &&
|
|
diff --git a/f b/f
|
|
index 0000000..d00491f
|
|
--- a/f
|
|
@@ -0,0 +1 @@
|
|
+1
|
|
EOF
|
|
test_must_fail git apply missing_new_filename.diff 2>err &&
|
|
test_grep "lacks filename information" err
|
|
'
|
|
|
|
test_expect_success 'apply diff with old filename missing from headers' '
|
|
cat >missing_old_filename.diff <<-\EOF &&
|
|
diff --git a/f b/f
|
|
index d00491f..0000000
|
|
+++ b/f
|
|
@@ -1 +0,0 @@
|
|
-1
|
|
EOF
|
|
test_must_fail git apply missing_old_filename.diff 2>err &&
|
|
test_grep "lacks filename information" err
|
|
'
|
|
|
|
test_done
|