Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t4001-diff-rename: wrap file creations in a test
author
Matthieu Moy
<Matthieu.Moy@imag.fr>
Thu, 25 Feb 2016 08:59:18 +0000
(09:59 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 25 Feb 2016 17:54:20 +0000
(09:54 -0800)
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4001-diff-rename.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
62df1e6
)
diff --git
a/t/t4001-diff-rename.sh
b/t/t4001-diff-rename.sh
index 2f327b749588af7eda57187cba4d365233a25ef9..06b8828a6d5734738260303031a09f5b5b2250be 100755
(executable)
--- 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
. ./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 \
'
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'
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.' \
test_expect_success \
'validate the output.' \