projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-reset.txt: Small fix + clarifications.
[git.git]
/
t
/
t4001-diff-rename.sh
diff --git
a/t/t4001-diff-rename.sh
b/t/t4001-diff-rename.sh
index
065ddb7
..
2e3c20d
100755
(executable)
--- a/
t/t4001-diff-rename.sh
+++ b/
t/t4001-diff-rename.sh
@@
-7,6
+7,7
@@
test_description='Test rename detection in diff engine.
'
. ./test-lib.sh
'
. ./test-lib.sh
+. ../diff-lib.sh
echo >path0 'Line 1
Line 2
echo >path0 'Line 1
Line 2
@@
-27,25
+28,25
@@
Line 15
test_expect_success \
'update-cache --add a file.' \
test_expect_success \
'update-cache --add a file.' \
- 'git-update-
cache
--add path0'
+ 'git-update-
index
--add path0'
test_expect_success \
'write that tree.' \
test_expect_success \
'write that tree.' \
- 'tree=$(git-write-tree)'
+ 'tree=$(git-write-tree)
&& echo $tree
'
sed -e 's/line/Line/' <path0 >path1
rm -f path0
test_expect_success \
'renamed and edited the file.' \
sed -e 's/line/Line/' <path0 >path1
rm -f path0
test_expect_success \
'renamed and edited the file.' \
- 'git-update-
cache
--add --remove path0 path1'
+ 'git-update-
index
--add --remove path0 path1'
test_expect_success \
test_expect_success \
- 'git-diff-
cache
-p -M after rename and editing.' \
- 'git-diff-
cache
-p -M $tree >current'
+ '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
cat >expected <<\EOF
diff --git a/path0 b/path1
-rename
old
path0
-rename
new
path1
+rename
from
path0
+rename
to
path1
--- a/path0
+++ b/path1
@@ -8,7 +8,7 @@ Line 7
--- a/path0
+++ b/path1
@@ -8,7 +8,7 @@ Line 7
@@
-61,6
+62,6
@@
EOF
test_expect_success \
'validate the output.' \
test_expect_success \
'validate the output.' \
- '
diff -I "rename similarity.*" >/dev/null
current expected'
+ '
compare_diff_patch
current expected'
test_done
test_done