undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: add tests for --relative without optional prefix value

Browse Source 
We already have tests for --relative, but they currently only test when
a prefix has been provided. This fails to test the case where --relative
by itself should use the current directory as the prefix.

Teach the check_$type functions to take a directory argument to indicate
which subdirectory to run the git commands in. Add a new test which uses
this to test --relative without a prefix value.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jacob Keller 2017-12-09 21:40:12 +01:00 committed by Junio C Hamano
parent 1efad51197
commit 6d7c17ec9d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
t/t4045-diff-relative.sh
View File

@ -13,6 +13,7 @@ test_expect_success 'setup' '
' '
check_diff() { check_diff() {
dir=$1; shift
expect=$1; shift expect=$1; shift
cat >expected <<EOF cat >expected <<EOF
diff --git a/$expect b/$expect diff --git a/$expect b/$expect
@ -24,50 +25,55 @@ index 0000000..25c05ef
+other content +other content
EOF EOF
test_expect_success "-p $*" " test_expect_success "-p $*" "
git diff -p $* HEAD^ >actual && git -C '$dir' diff -p $* HEAD^ >actual &&
test_cmp expected actual test_cmp expected actual
" "
} }
check_numstat() { check_numstat() {
dir=$1; shift
expect=$1; shift expect=$1; shift
cat >expected <<EOF cat >expected <<EOF
1 0 $expect 1 0 $expect
EOF EOF
test_expect_success "--numstat $*" " test_expect_success "--numstat $*" "
echo '1 0 $expect' >expected && echo '1 0 $expect' >expected &&
git diff --numstat $* HEAD^ >actual && git -C '$dir' diff --numstat $* HEAD^ >actual &&
test_cmp expected actual test_cmp expected actual
" "
} }
check_stat() { check_stat() {
dir=$1; shift
expect=$1; shift expect=$1; shift
cat >expected <<EOF cat >expected <<EOF
$expect | 1 + $expect | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
EOF EOF
test_expect_success "--stat $*" " test_expect_success "--stat $*" "
git diff --stat $* HEAD^ >actual && git -C '$dir' diff --stat $* HEAD^ >actual &&
test_i18ncmp expected actual test_i18ncmp expected actual
" "
} }
check_raw() { check_raw() {
dir=$1; shift
expect=$1; shift expect=$1; shift
cat >expected <<EOF cat >expected <<EOF
:000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect :000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect
EOF EOF
test_expect_success "--raw $*" " test_expect_success "--raw $*" "
git diff --no-abbrev --raw $* HEAD^ >actual && git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
test_cmp expected actual test_cmp expected actual
" "
} }
for type in diff numstat stat raw; do for type in diff numstat stat raw
check_$type file2 --relative=subdir/ do
check_$type file2 --relative=subdir check_$type . file2 --relative=subdir/
check_$type dir/file2 --relative=sub check_$type . file2 --relative=subdir
check_$type subdir file2 --relative
check_$type . dir/file2 --relative=sub
done done
test_done test_done