From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Donald R Laster Jr <laster@dlaster.com>,
Jacob Keller <jacob.keller@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH v3 6/7] diff: add tests for --relative without optional prefix value
Date: Sat, 9 Dec 2017 21:40:12 +0100 [thread overview]
Message-ID: <20171209204013.10997-6-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20171209204013.10997-1-chriscool@tuxfamily.org>
From: Jacob Keller <jacob.keller@gmail.com>
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>
---
t/t4045-diff-relative.sh | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 3950f5034d..7d68a6e2a5 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,54 @@ 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
+ check_$type . file2 --relative=subdir/
+ check_$type . file2 --relative=subdir
+ check_$type . dir/file2 --relative=sub
+ check_$type subdir file2 --relative
done
test_done
--
2.15.1.361.g8b07d831d0
next prev parent reply other threads:[~2017-12-09 20:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-09 20:40 [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg() Christian Couder
2017-12-09 20:40 ` [PATCH v3 2/7] index-pack: use skip_to_optional_arg() Christian Couder
2017-12-09 20:40 ` [PATCH v3 3/7] diff: " Christian Couder
2017-12-09 20:40 ` [PATCH v3 4/7] diff: use skip_to_optional_arg_default() Christian Couder
2017-12-09 20:40 ` [PATCH v3 5/7] diff: use skip_to_optional_arg_default() in parsing --relative Christian Couder
2017-12-09 20:40 ` Christian Couder [this message]
2017-12-09 20:40 ` [PATCH v3 7/7] t4045: reindent to make helpers readable Christian Couder
2017-12-10 14:31 ` [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg() Jeff King
2017-12-10 14:39 ` Jeff King
2017-12-11 5:56 ` Christian Couder
2017-12-11 23:23 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171209204013.10997-6-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=laster@dlaster.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).