t/t4053-diff-no-index.sh

#!/bin/sh

test_description='diff --no-index'

. ./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 with -' '
	cat >expect <<-\EOF &&
	diff --git a/- b/-
	new file mode 100644
	--- /dev/null
	+++ b/-
	@@ -0,0 +1 @@
	+frotz
	EOF
	(
		cd a &&
		echo frotz |
		test_expect_code 1 git diff --no-index /dev/null - >../actual
	) &&
	test_cmp expect actual
'

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 'git diff --find-object outside repo fails gracefully' '
	(
		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
		export GIT_CEILING_DIRECTORIES &&
		cd non/git &&
		test_must_fail git diff --find-object=abc123 2>err &&
		test_grep "find-object requires a git repository" 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 'reverse diff when turning a file into a directory' '
	(
		cd non/git &&
		printf "A\td/sub\nD\te/sub/file\n" >expect &&
		test_expect_code 1 git diff --no-index -R --name-status d e >actual &&
		test_cmp expect actual
	)
'

test_expect_success 'reverse diff when turning a directory into a file' '
	(
		cd non/git &&
		printf "D\td/sub\nA\te/sub/file\n" >expect &&
		test_expect_code 1 git diff --no-index -R --name-status e d >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 &&
	test_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 &&
	test_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_expect_success 'diff --no-index F F rejects pathspecs' '
	test_must_fail git diff --no-index -- a/1 a/2 a 2>actual.err &&
	test_grep "usage: git diff --no-index" actual.err
'

test_expect_success 'diff --no-index D F rejects pathspecs' '
	test_must_fail git diff --no-index -- a a/2 a 2>actual.err &&
	test_grep "usage: git diff --no-index" actual.err
'

test_expect_success 'diff --no-index F D rejects pathspecs' '
	test_must_fail git diff --no-index -- a/1 b b 2>actual.err &&
	test_grep "usage: git diff --no-index" actual.err
'

test_expect_success 'diff --no-index rejects absolute pathspec' '
	test_must_fail git diff --no-index -- a b $(pwd)/a/1
'

test_expect_success 'diff --no-index with pathspec' '
	test_expect_code 1 git diff --name-status --no-index a b 1 >actual &&
	cat >expect <<-EOF &&
	D	a/1
	EOF
	test_cmp expect actual
'

test_expect_success 'diff --no-index first path ending in slash with pathspec' '
	test_expect_code 1 git diff --name-status --no-index a/ b 1 >actual &&
	cat >expect <<-EOF &&
	D	a/1
	EOF
	test_cmp expect actual
'

test_expect_success 'diff --no-index second path ending in slash with pathspec' '
	test_expect_code 1 git diff --name-status --no-index a b/ 1 >actual &&
	cat >expect <<-EOF &&
	D	a/1
	EOF
	test_cmp expect actual
'

test_expect_success 'diff --no-index with pathspec no matches' '
	test_expect_code 0 git diff --name-status --no-index a b missing
'

test_expect_success 'diff --no-index with negative pathspec' '
	test_expect_code 1 git diff --name-status --no-index a b ":!2" >actual &&
	cat >expect <<-EOF &&
	D	a/1
	EOF
	test_cmp expect actual
'

test_expect_success 'setup nested' '
	mkdir -p c/1/2 &&
	mkdir -p d/1/2 &&
	echo 1 >c/1/2/a &&
	echo 2 >c/1/2/b
'

test_expect_success 'diff --no-index with pathspec nested negative pathspec' '
	test_expect_code 0 git diff --no-index c d ":!1"
'

test_expect_success 'diff --no-index with pathspec nested pathspec' '
	test_expect_code 1 git diff --name-status --no-index c d 1/2 >actual &&
	cat >expect <<-EOF &&
	D	c/1/2/a
	D	c/1/2/b
	EOF
	test_cmp expect actual
'

test_expect_success 'diff --no-index with pathspec glob' '
	test_expect_code 1 git diff --name-status --no-index c d ":(glob)**/a" >actual &&
	cat >expect <<-EOF &&
	D	c/1/2/a
	EOF
	test_cmp expect actual
'

test_expect_success 'diff --no-index with pathspec glob and exclude' '
	test_expect_code 1 git diff --name-status --no-index c d ":(glob,exclude)**/a" >actual &&
	cat >expect <<-EOF &&
	D	c/1/2/b
	EOF
	test_cmp expect actual
'

test_done