mirror of
https://github.com/git/git.git
synced 2024-12-12 11:24:02 +08:00
85a9a63c92
Running this:
$ touch foo bar
$ chmod +x foo
$ git -c diff.external=echo diff --ext-diff --no-index foo bar
results in a segfault. The issue is that run_diff_cmd() passes a NULL
"xfrm_msg" variable to run_external_diff(), which feeds it to
strvec_push(), causing the segfault. The bug dates back to 82fbf269b9
(run_external_diff: use an argv_array for the command line, 2014-04-19),
though it mostly only ever worked accidentally. Before then, we just
stuck the NULL pointer into a "const char **" array, so our NULL ended
up acting as an extra end-of-argv sentinel (which was OK, because it was
the last thing in the array).
Curiously, though, this is only a problem with --no-index. We set up
xfrm_msg by calling fill_metainfo(). This result may be empty, or may
have text like "index 1234..5678\n", "rename from foo\nrename from
bar\n", etc. In run_external_diff(), we only look at xfrm_msg if the
"other" variable is not NULL. That variable is set when the paths of the
two sides of the diff pair aren't the same (in which case the
destination path becomes "other"). So normally it would kick in only for
a rename, in which case xfrm_msg should not be NULL (it would have the
rename information in it).
But with a "--no-index" of two blobs, we of course have two different
pathnames, and thus end up with a non-NULL "other" filename (which is
always just a repeat of the file2-name), but possibly a NULL xfrm_msg.
So how to fix it? I have a feeling that --no-index always passing
"other" to the external diff command is probably a bug. There was no
rename, and the name is always redundant with existing information we
pass (and this may even cause us to pass a useless "xfrm_msg" that
contains an "index 1234..5678" line). So one option would be to change
that behavior. We don't seem to have ever documented the "other" or
"xfrm_msg" parameters for external diffs.
But I'm not sure what fallout we might have from changing that behavior
now. So this patch takes the less-risky option, and simply teaches
run_external_diff() to avoid passing xfrm_msg when it's NULL. That makes
it agnostic to whether "other" and "xfrm_msg" always come as a pair. It
fixes the segfault now, and if we want to change the --no-index "other"
behavior on top, it will handle that, too.
Reported-by: Wilfred Hughes <me@wilfred.me.uk>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
300 lines
7.5 KiB
Bash
Executable File
300 lines
7.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='diff --no-index'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir a &&
|
|
mkdir b &&
|
|
echo 1 >a/1 &&
|
|
echo 2 >a/2 &&
|
|
git init repo &&
|
|
echo 1 >repo/a &&
|
|
mkdir -p non/git &&
|
|
echo 1 >non/git/a &&
|
|
echo 1 >non/git/b
|
|
'
|
|
|
|
test_expect_success 'git diff --no-index --exit-code' '
|
|
git diff --no-index --exit-code a/1 non/git/a &&
|
|
test_expect_code 1 git diff --no-index --exit-code a/1 a/2
|
|
'
|
|
|
|
test_expect_success 'git diff --no-index directories' '
|
|
test_expect_code 1 git diff --no-index a b >cnt &&
|
|
test_line_count = 14 cnt
|
|
'
|
|
|
|
test_expect_success 'git diff --no-index relative path outside repo' '
|
|
(
|
|
cd repo &&
|
|
test_expect_code 0 git diff --no-index a ../non/git/a &&
|
|
test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git diff --no-index with broken index' '
|
|
(
|
|
cd repo &&
|
|
echo broken >.git/index &&
|
|
git diff --no-index a ../non/git/a
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git diff outside repo with broken index' '
|
|
(
|
|
cd repo &&
|
|
git diff ../non/git/a ../non/git/b
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git diff --no-index executed outside repo gives correct error message' '
|
|
(
|
|
GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
test_must_fail git diff --no-index a 2>actual.err &&
|
|
test_grep "usage: git diff --no-index" actual.err
|
|
)
|
|
'
|
|
|
|
test_expect_success 'diff D F and diff F D' '
|
|
(
|
|
cd repo &&
|
|
echo in-repo >a &&
|
|
echo non-repo >../non/git/a &&
|
|
mkdir sub &&
|
|
echo sub-repo >sub/a &&
|
|
|
|
test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
|
|
test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
test_must_fail git diff --no-index a ../non/git/a >expect &&
|
|
test_must_fail git diff --no-index a ../non/git/ >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
test_must_fail git diff --no-index ../non/git/a a >expect &&
|
|
test_must_fail git diff --no-index ../non/git a >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'turning a file into a directory' '
|
|
(
|
|
cd non/git &&
|
|
mkdir d e e/sub &&
|
|
echo 1 >d/sub &&
|
|
echo 2 >e/sub/file &&
|
|
printf "D\td/sub\nA\te/sub/file\n" >expect &&
|
|
test_must_fail git diff --no-index --name-status d e >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'diff from repo subdir shows real paths (explicit)' '
|
|
echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
|
|
test_expect_code 1 \
|
|
git -C repo/sub \
|
|
diff --no-index ../../non/git/a ../../non/git/b >actual &&
|
|
head -n 1 <actual >actual.head &&
|
|
test_cmp expect actual.head
|
|
'
|
|
|
|
test_expect_success 'diff from repo subdir shows real paths (implicit)' '
|
|
echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
|
|
test_expect_code 1 \
|
|
git -C repo/sub \
|
|
diff ../../non/git/a ../../non/git/b >actual &&
|
|
head -n 1 <actual >actual.head &&
|
|
test_cmp expect actual.head
|
|
'
|
|
|
|
test_expect_success 'diff --no-index from repo subdir respects config (explicit)' '
|
|
echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
|
|
test_config -C repo diff.noprefix true &&
|
|
test_expect_code 1 \
|
|
git -C repo/sub \
|
|
diff --no-index ../../non/git/a ../../non/git/b >actual &&
|
|
head -n 1 <actual >actual.head &&
|
|
test_cmp expect actual.head
|
|
'
|
|
|
|
test_expect_success 'diff --no-index from repo subdir respects config (implicit)' '
|
|
echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
|
|
test_config -C repo diff.noprefix true &&
|
|
test_expect_code 1 \
|
|
git -C repo/sub \
|
|
diff ../../non/git/a ../../non/git/b >actual &&
|
|
head -n 1 <actual >actual.head &&
|
|
test_cmp expect actual.head
|
|
'
|
|
|
|
test_expect_success 'diff --no-index from repo subdir with absolute paths' '
|
|
cat <<-EOF >expect &&
|
|
1 1 $(pwd)/non/git/{a => b}
|
|
EOF
|
|
test_expect_code 1 \
|
|
git -C repo/sub diff --numstat \
|
|
"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff --no-index allows external diff' '
|
|
test_expect_code 1 \
|
|
env GIT_EXTERNAL_DIFF="echo external ;:" \
|
|
git diff --no-index non/git/a non/git/b >actual &&
|
|
echo external >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff --no-index normalizes mode: no changes' '
|
|
echo foo >x &&
|
|
cp x y &&
|
|
git diff --no-index x y >out &&
|
|
test_must_be_empty out
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'diff --no-index normalizes mode: chmod +x' '
|
|
chmod +x y &&
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/x b/y
|
|
old mode 100644
|
|
new mode 100755
|
|
EOF
|
|
test_expect_code 1 git diff --no-index x y >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'diff --no-index normalizes: mode not like git mode' '
|
|
chmod 666 x &&
|
|
chmod 777 y &&
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/x b/y
|
|
old mode 100644
|
|
new mode 100755
|
|
EOF
|
|
test_expect_code 1 git diff --no-index x y >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SYMLINKS 'diff --no-index normalizes: mode not like git mode (symlink)' '
|
|
ln -s y z &&
|
|
X_OID=$(git hash-object --stdin <x) &&
|
|
Z_OID=$(printf y | git hash-object --stdin) &&
|
|
cat >expected <<-EOF &&
|
|
diff --git a/x b/x
|
|
deleted file mode 100644
|
|
index $X_OID..$ZERO_OID
|
|
--- a/x
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-foo
|
|
diff --git a/z b/z
|
|
new file mode 120000
|
|
index $ZERO_OID..$Z_OID
|
|
--- /dev/null
|
|
+++ b/z
|
|
@@ -0,0 +1 @@
|
|
+y
|
|
\ No newline at end of file
|
|
EOF
|
|
test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'external diff with mode-only change' '
|
|
echo content >not-executable &&
|
|
echo content >executable &&
|
|
chmod +x executable &&
|
|
echo executable executable $(test_oid zero) 100755 \
|
|
not-executable $(test_oid zero) 100644 not-executable \
|
|
>expect &&
|
|
test_expect_code 1 git -c diff.external=echo diff \
|
|
--no-index executable not-executable >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "diff --no-index treats '-' as stdin" '
|
|
cat >expect <<-EOF &&
|
|
diff --git a/- b/a/1
|
|
index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
|
|
--- a/-
|
|
+++ b/a/1
|
|
@@ -1 +1 @@
|
|
-x
|
|
+1
|
|
EOF
|
|
|
|
test_write_lines x | test_expect_code 1 \
|
|
git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success "diff --no-index -R treats '-' as stdin" '
|
|
cat >expect <<-EOF &&
|
|
diff --git b/a/1 a/-
|
|
index $(git hash-object --stdin <a/1)..$ZERO_OID 100644
|
|
--- b/a/1
|
|
+++ a/-
|
|
@@ -1 +1 @@
|
|
-1
|
|
+x
|
|
EOF
|
|
|
|
test_write_lines x | test_expect_code 1 \
|
|
git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'diff --no-index refuses to diff stdin and a directory' '
|
|
test_must_fail git diff --no-index -- - a </dev/null 2>err &&
|
|
grep "fatal: cannot compare stdin to a directory" err
|
|
'
|
|
|
|
test_expect_success PIPE 'diff --no-index refuses to diff a named pipe and a directory' '
|
|
test_when_finished "rm -f pipe" &&
|
|
mkfifo pipe &&
|
|
test_must_fail git diff --no-index -- pipe a 2>err &&
|
|
grep "fatal: cannot compare a named pipe to a directory" err
|
|
'
|
|
|
|
test_expect_success PIPE,SYMLINKS 'diff --no-index reads from pipes' '
|
|
test_when_finished "rm -f old new new-link" &&
|
|
mkfifo old &&
|
|
mkfifo new &&
|
|
ln -s new new-link &&
|
|
{
|
|
(test_write_lines a b c >old) &
|
|
} &&
|
|
test_when_finished "kill $! || :" &&
|
|
{
|
|
(test_write_lines a x c >new) &
|
|
} &&
|
|
test_when_finished "kill $! || :" &&
|
|
|
|
cat >expect <<-EOF &&
|
|
diff --git a/old b/new-link
|
|
--- a/old
|
|
+++ b/new-link
|
|
@@ -1,3 +1,3 @@
|
|
a
|
|
-b
|
|
+x
|
|
c
|
|
EOF
|
|
|
|
test_expect_code 1 git diff --no-index old new-link >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|