Revision 00653435488f5ed86c5d6dc411fa14fa56f5e3bc authored by Junio C Hamano on 18 January 2012, 23:46:31 UTC, committed by Junio C Hamano on 18 January 2012, 23:46:31 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5c8eeb8
Raw File
t4045-diff-relative.sh
#!/bin/sh

test_description='diff --relative tests'
. ./test-lib.sh

test_expect_success 'setup' '
	git commit --allow-empty -m empty &&
	echo content >file1 &&
	mkdir subdir &&
	echo other content >subdir/file2 &&
	git add . &&
	git commit -m one
'

check_diff() {
expect=$1; shift
cat >expected <<EOF
diff --git a/$expect b/$expect
new file mode 100644
index 0000000..25c05ef
--- /dev/null
+++ b/$expect
@@ -0,0 +1 @@
+other content
EOF
test_expect_success "-p $*" "
	git diff -p $* HEAD^ >actual &&
	test_cmp expected actual
"
}

check_stat() {
expect=$1; shift
cat >expected <<EOF
 $expect |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
EOF
test_expect_success "--stat $*" "
	git diff --stat $* HEAD^ >actual &&
	test_cmp expected actual
"
}

check_raw() {
expect=$1; shift
cat >expected <<EOF
:000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A	$expect
EOF
test_expect_success "--raw $*" "
	git diff --no-abbrev --raw $* HEAD^ >actual &&
	test_cmp expected actual
"
}

for type in diff stat raw; do
	check_$type file2 --relative=subdir/
	check_$type file2 --relative=subdir
	check_$type dir/file2 --relative=sub
done

test_done
back to top