Revision 2e8451e8602380a8a129f21da6364f3ea879e6a9 authored by Jiang Xin on 26 July 2013, 06:00:02 UTC, committed by Jiang Xin on 03 August 2013, 06:14:07 UTC
Translate 99 new messages came from git.pot update in 28b3cff
(l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
1 parent e06dc12
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_numstat() {
expect=$1; shift
cat >expected <<EOF
1	0	$expect
EOF
test_expect_success "--numstat $*" "
	echo '1	0	$expect' >expected &&
	git diff --numstat $* HEAD^ >actual &&
	test_cmp expected actual
"
}

check_stat() {
expect=$1; shift
cat >expected <<EOF
 $expect | 1 +
 1 file changed, 1 insertion(+)
EOF
test_expect_success "--stat $*" "
	git diff --stat $* HEAD^ >actual &&
	test_i18ncmp 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 numstat 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