You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
1.2 KiB
62 lines
1.2 KiB
14 years ago
|
#!/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
|