2012-05-16 14:28:31 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='diff --no-index'
|
|
|
|
|
|
tests: mark tests as passing with SANITIZE=leak
This marks tests that have been leak-free since various recent
commits, but which were not marked us such when the memory leak was
fixed. These were mostly discovered with the "check" mode added in
faececa53f9 (test-lib: have the "check" mode for SANITIZE=leak
consider leak logs, 2022-07-28).
Commits that fixed the last memory leak in these tests. Per narrowing
down when they started to pass under SANITIZE=leak with "bisect":
- t1022-read-tree-partial-clone.sh:
7e2619d8ff0 (list_objects_filter_options: plug leak of filter_spec
strings, 2022-09-08)
- t4053-diff-no-index.sh: 07a6f94a6d0 (diff-no-index: release prefixed
filenames, 2022-09-07)
- t6415-merge-dir-to-symlink.sh: bac92b1f39f (Merge branch
'js/ort-clean-up-after-failed-merge', 2022-08-08).
- t5554-noop-fetch-negotiator.sh:
66eede4a37c (prepare_repo_settings(): plug leak of config values,
2022-09-08)
- t2012-checkout-last.sh, t7504-commit-msg-hook.sh,
t91{15,46,60}-git-svn-*.sh: The in-flight "pw/rebase-no-reflog-action"
series, upon which this is based:
https://lore.kernel.org/git/pull.1405.git.1667575142.gitgitgadget@gmail.com/
Let's mark all of these as passing with
"TEST_PASSES_SANITIZE_LEAK=true", to have it regression tested,
including as part of the "linux-leaks" CI job.
Additionally, let's remove the "!SANITIZE_LEAK" prerequisite from
tests that now pass, these were marked as failing in:
- 77e56d55ba6 (diff.c: fix a double-free regression in a18d66cefb,
2022-03-17)
- c4d1d526312 (tests: change some 'test $(git) = "x"' to test_cmp,
2022-03-07)
These were not spotted with the new "check" mode, but manually, it
doesn't cover these sort of prerequisites. There's few enough that we
shouldn't bother to automate it. They'll be going away sooner than
later.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-11-08 18:17:37 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2012-05-16 14:28:31 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
mkdir a &&
|
|
|
|
|
mkdir b &&
|
|
|
|
|
echo 1 >a/1 &&
|
2012-06-21 18:09:50 +00:00
|
|
|
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
|
2012-05-16 14:28:31 +00:00
|
|
|
'
|
|
|
|
|
|
2021-03-21 22:36:19 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2012-05-16 14:28:31 +00:00
|
|
|
test_expect_success 'git diff --no-index directories' '
|
2015-03-20 10:11:46 +00:00
|
|
|
test_expect_code 1 git diff --no-index a b >cnt &&
|
|
|
|
|
test_line_count = 14 cnt
|
2012-05-16 14:28:31 +00:00
|
|
|
'
|
|
|
|
|
|
2012-06-21 18:09:50 +00:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-12-11 09:58:43 +00:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-12-16 20:19:23 +00:00
|
|
|
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 &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep "usage: git diff --no-index" actual.err
|
2013-12-16 20:19:23 +00:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2015-03-25 23:11:39 +00:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2015-03-22 05:11:27 +00:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
diff: handle --no-index prefixes consistently
If we see an explicit "git diff --no-index ../foo ../bar",
then we do not set up the git repository at all (we already
know we are in --no-index mode, so do not have to check "are
we in a repository?"), and hence have no "prefix" within the
repository. A patch generated by this command will have the
filenames "a/../foo" and "b/../bar", no matter which
directory we are in with respect to any repository.
However, in the implicit case, where we notice that the
files are outside the repository, we will have chdir()'d to
the top-level of the repository. We then feed the prefix
back to the diff machinery. As a result, running the same
diff from a subdirectory will result in paths that look like
"a/subdir/../../foo".
Besides being unnecessarily long, this may also be confusing
to the user: they don't care about the subdir or the
repository at all; it's just where they happened to be when
running the command. We should treat this the same as the
explicit --no-index case.
One way to address this would be to chdir() back to the
original path before running our diff. However, that's a bit
hacky, as we would also need to adjust $GIT_DIR, which could
be a relative path from our top-level.
Instead, we can reuse the diff machinery's RELATIVE_NAME
option, which automatically strips off the prefix. Note that
this _also_ restricts the diff to this relative prefix, but
that's OK for our purposes: we queue our own diff pairs
manually, and do not rely on that part of the diff code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-13 03:23:32 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
diff: always try to set up the repository
If we see an explicit "--no-index", we do not bother calling
setup_git_directory_gently() at all. This means that we may
miss out on reading repo-specific config.
It's arguable whether this is correct or not. If we were
designing from scratch, making "git diff --no-index"
completely ignore the repository makes some sense. But we
are nowhere near scratch, so let's look at the existing
behavior:
1. If you're in the top-level of a repository and run an
explicit "diff --no-index", the config subsystem falls
back to reading ".git/config", and we will respect repo
config.
2. If you're in a subdirectory of a repository, then we
still try to read ".git/config", but it generally
doesn't exist. So "diff --no-index" there does not
respect repo config.
3. If you have $GIT_DIR set in the environment, we read
and respect $GIT_DIR/config,
4. If you run "git diff /tmp/foo /tmp/bar" to get an
implicit no-index, we _do_ run the repository setup,
and set $GIT_DIR (or respect an existing $GIT_DIR
variable). We find the repo config no matter where we
started, and respect it.
So we already respect the repository config in a number of
common cases, and case (2) is the only one that does not.
And at least one of our tests, t4034, depends on case (1)
behaving as it does now (though it is just incidental, not
an explicit test for this behavior).
So let's bring case (2) in line with the others by always
running the repository setup, even with an explicit
"--no-index". We shouldn't need to change anything else, as the
implicit case already handles the prefix.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-13 03:23:36 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2018-10-19 16:58:07 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2019-02-16 06:57:56 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2021-03-21 22:36:20 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
diff: handle NULL meta-info when spawning external diff
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>
2024-01-29 01:57:08 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2023-07-05 19:49:29 +00:00
|
|
|
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
|
2023-09-09 22:12:52 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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
|
2023-07-05 19:49:29 +00:00
|
|
|
'
|
|
|
|
|
|
2023-07-05 19:49:27 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2023-07-05 19:49:30 +00:00
|
|
|
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) &
|
|
|
|
|
} &&
|
2023-08-10 14:33:13 +00:00
|
|
|
test_when_finished "kill $! || :" &&
|
2023-07-05 19:49:30 +00:00
|
|
|
{
|
|
|
|
|
(test_write_lines a x c >new) &
|
|
|
|
|
} &&
|
2023-08-10 14:33:13 +00:00
|
|
|
test_when_finished "kill $! || :" &&
|
2023-07-05 19:49:30 +00:00
|
|
|
|
|
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2012-05-16 14:28:31 +00:00
|
|
|
test_done
|