From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, peff@peff.net, Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v2 3/5] t: add tests for diff.renames (true/false/unset)
Date: Thu, 25 Feb 2016 09:59:19 +0100 [thread overview]
Message-ID: <1456390761-27015-4-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1456390761-27015-1-git-send-email-Matthieu.Moy@imag.fr>
The underlying machinery is well-tested, but the configuration option
itself was tested only in t3400-rebase.sh.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
t/t4001-diff-rename.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 06b8828..f5239b5 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' '
Line 14
Line 15
EOF
- cat >expected <<-\EOF
+ cat >expected <<-\EOF &&
diff --git a/path0 b/path1
rename from path0
rename to path1
@@ -43,6 +43,50 @@ test_expect_success 'setup' '
Line 13
Line 14
EOF
+ cat >no-rename <<-\EOF
+ diff --git a/path0 b/path0
+ deleted file mode 100644
+ index fdbec44..0000000
+ --- a/path0
+ +++ /dev/null
+ @@ -1,15 +0,0 @@
+ -Line 1
+ -Line 2
+ -Line 3
+ -Line 4
+ -Line 5
+ -Line 6
+ -Line 7
+ -Line 8
+ -Line 9
+ -Line 10
+ -line 11
+ -Line 12
+ -Line 13
+ -Line 14
+ -Line 15
+ diff --git a/path1 b/path1
+ new file mode 100644
+ index 0000000..752c50e
+ --- /dev/null
+ +++ b/path1
+ @@ -0,0 +1,15 @@
+ +Line 1
+ +Line 2
+ +Line 3
+ +Line 4
+ +Line 5
+ +Line 6
+ +Line 7
+ +Line 8
+ +Line 9
+ +Line 10
+ +Line 11
+ +Line 12
+ +Line 13
+ +Line 14
+ +Line 15
+ EOF
'
test_expect_success \
@@ -68,6 +112,21 @@ test_expect_success \
'validate the output.' \
'compare_diff_patch current expected'
+test_expect_success 'test diff.renames=true' '
+ git -c diff.renames=true diff --cached $tree >current &&
+ compare_diff_patch current expected
+'
+
+test_expect_success 'test diff.renames=false' '
+ git -c diff.renames=false diff --cached $tree >current &&
+ compare_diff_patch current no-rename
+'
+
+test_expect_success 'test diff.renames unset' '
+ git diff --cached $tree >current &&
+ compare_diff_patch current no-rename
+'
+
test_expect_success 'favour same basenames over different ones' '
cp path1 another-path &&
git add another-path &&
--
2.7.2.334.g35ed2ae.dirty
next prev parent reply other threads:[~2016-02-25 9:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 17:44 [PATCH 0/5] activate diff.renames by default Matthieu Moy
2016-02-23 17:44 ` [PATCH 1/5] Documentation/diff-config: fix description of diff.renames Matthieu Moy
2016-02-24 10:27 ` Jeff King
2016-02-25 17:27 ` Felipe Gonçalves Assis
2016-02-25 17:34 ` Matthieu Moy
2016-02-23 17:44 ` [PATCH 2/5] t4001-diff-rename: wrap file creations in a test Matthieu Moy
2016-02-24 10:25 ` Jeff King
2016-02-24 13:16 ` Matthieu Moy
2016-02-23 17:44 ` [PATCH 3/5] t: add tests for diff.renames (true/false/unset) Matthieu Moy
2016-02-23 17:44 ` [PATCH 4/5] log: introduce init_log_defaults() Matthieu Moy
2016-02-23 17:44 ` [PATCH 5/5] diff: activate diff.renames by default Matthieu Moy
2016-02-23 21:01 ` Junio C Hamano
2016-02-23 21:11 ` Matthieu Moy
2016-02-24 10:42 ` Jeff King
2016-02-25 8:54 ` Matthieu Moy
2016-02-23 19:17 ` [PATCH 0/5] " Junio C Hamano
2016-02-23 20:46 ` Matthieu Moy
2016-02-23 21:40 ` Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 " Matthieu Moy
2016-02-25 8:59 ` [PATCH v2 1/5] Documentation/diff-config: fix description of diff.renames Matthieu Moy
2016-02-25 17:37 ` [PATCH v2.1] " Matthieu Moy
2016-02-25 18:18 ` Junio C Hamano
2016-02-25 17:53 ` [PATCH v2 1/5] " Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 2/5] t4001-diff-rename: wrap file creations in a test Matthieu Moy
2016-02-25 8:59 ` Matthieu Moy [this message]
2016-02-25 8:59 ` [PATCH v2 4/5] log: introduce init_log_defaults() Matthieu Moy
2016-02-25 19:31 ` Junio C Hamano
2016-02-25 8:59 ` [PATCH v2 5/5] diff: activate diff.renames by default Matthieu Moy
2016-02-25 17:52 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456390761-27015-4-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).