diff options
| author | Jacob Keller <jacob.keller@gmail.com> | 2017-12-09 20:40:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-12 00:13:42 (GMT) |
| commit | 6d7c17ec9d4b6c384648d5bc28bc234e3083c66e (patch) | |
| tree | f8ef0b82d171081d321975521a7adb09b99447a7 /t | |
| parent | 1efad51197f52ba9fb928b92a7f92514ab02a97f (diff) | |
| download | git-6d7c17ec9d4b6c384648d5bc28bc234e3083c66e.zip git-6d7c17ec9d4b6c384648d5bc28bc234e3083c66e.tar.gz git-6d7c17ec9d4b6c384648d5bc28bc234e3083c66e.tar.bz2 | |
diff: add tests for --relative without optional prefix value
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4045-diff-relative.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 3950f50..22fcacf 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -13,6 +13,7 @@ test_expect_success 'setup' ' ' check_diff() { +dir=$1; shift expect=$1; shift cat >expected <<EOF diff --git a/$expect b/$expect @@ -24,50 +25,55 @@ index 0000000..25c05ef +other content EOF test_expect_success "-p $*" " - git diff -p $* HEAD^ >actual && + git -C '$dir' diff -p $* HEAD^ >actual && test_cmp expected actual " } check_numstat() { +dir=$1; shift expect=$1; shift cat >expected <<EOF 1 0 $expect EOF test_expect_success "--numstat $*" " echo '1 0 $expect' >expected && - git diff --numstat $* HEAD^ >actual && + git -C '$dir' diff --numstat $* HEAD^ >actual && test_cmp expected actual " } check_stat() { +dir=$1; shift expect=$1; shift cat >expected <<EOF $expect | 1 + 1 file changed, 1 insertion(+) EOF test_expect_success "--stat $*" " - git diff --stat $* HEAD^ >actual && + git -C '$dir' diff --stat $* HEAD^ >actual && test_i18ncmp expected actual " } check_raw() { +dir=$1; shift expect=$1; shift cat >expected <<EOF :000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect EOF test_expect_success "--raw $*" " - git diff --no-abbrev --raw $* HEAD^ >actual && + git -C '$dir' 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 +for type in diff numstat stat raw +do + check_$type . file2 --relative=subdir/ + check_$type . file2 --relative=subdir + check_$type subdir file2 --relative + check_$type . dir/file2 --relative=sub done test_done |