git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 2/5] t4001-diff-rename: wrap file creations in a test
Date: Thu, 25 Feb 2016 09:59:18 +0100	[thread overview]
Message-ID: <1456390761-27015-3-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1456390761-27015-1-git-send-email-Matthieu.Moy@imag.fr>

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
 t/t4001-diff-rename.sh | 66 ++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 2f327b7..06b8828 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -9,21 +9,40 @@ test_description='Test rename detection in diff engine.
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
-echo >path0 '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
+test_expect_success 'setup' '
+	cat >path0 <<-\EOF &&
+	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
+	cat >expected <<-\EOF
+	diff --git a/path0 b/path1
+	rename from path0
+	rename to path1
+	--- a/path0
+	+++ b/path1
+	@@ -8,7 +8,7 @@ Line 7
+	 Line 8
+	 Line 9
+	 Line 10
+	-line 11
+	+Line 11
+	 Line 12
+	 Line 13
+	 Line 14
+	EOF
 '
 
 test_expect_success \
@@ -43,22 +62,7 @@ test_expect_success \
 test_expect_success \
     'git diff-index -p -M after rename and editing.' \
     'git diff-index -p -M $tree >current'
-cat >expected <<\EOF
-diff --git a/path0 b/path1
-rename from path0
-rename to path1
---- a/path0
-+++ b/path1
-@@ -8,7 +8,7 @@ Line 7
- Line 8
- Line 9
- Line 10
--line 11
-+Line 11
- Line 12
- Line 13
- Line 14
-EOF
+
 
 test_expect_success \
     'validate the output.' \
-- 
2.7.2.334.g35ed2ae.dirty

  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   ` Matthieu Moy [this message]
2016-02-25  8:59   ` [PATCH v2 3/5] t: add tests for diff.renames (true/false/unset) Matthieu Moy
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-3-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).