projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send-email: do not pass bogus address to local sendmail binary
[git.git]
/
t
/
t4008-diff-break-rewrite.sh
diff --git
a/t/t4008-diff-break-rewrite.sh
b/t/t4008-diff-break-rewrite.sh
index
4c971c9
..
263ac1e
100755
(executable)
--- a/
t/t4008-diff-break-rewrite.sh
+++ b/
t/t4008-diff-break-rewrite.sh
@@
-28,7
+28,7
@@
test_expect_success \
setup \
'cat ../../README >file0 &&
cat ../../COPYING >file1 &&
setup \
'cat ../../README >file0 &&
cat ../../COPYING >file1 &&
- git-update-
cache
--add file0 file1 &&
+ git-update-
index
--add file0 file1 &&
tree=$(git-write-tree) &&
echo "$tree"'
tree=$(git-write-tree) &&
echo "$tree"'
@@
-36,11
+36,11
@@
test_expect_success \
'change file1 with copy-edit of file0 and remove file0' \
'sed -e "s/git/GIT/" file0 >file1 &&
rm -f file0 &&
'change file1 with copy-edit of file0 and remove file0' \
'sed -e "s/git/GIT/" file0 >file1 &&
rm -f file0 &&
- git-update-
cache
--remove file0 file1'
+ git-update-
index
--remove file0 file1'
test_expect_success \
'run diff with -B' \
test_expect_success \
'run diff with -B' \
- 'git-diff-
cache
-B --cached "$tree" >current'
+ 'git-diff-
index
-B --cached "$tree" >current'
cat >expected <<\EOF
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
cat >expected <<\EOF
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
@@
-53,7
+53,7
@@
test_expect_success \
test_expect_success \
'run diff with -B and -M' \
test_expect_success \
'run diff with -B and -M' \
- 'git-diff-
cache
-B -M "$tree" >current'
+ 'git-diff-
index
-B -M "$tree" >current'
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c R100 file0 file1
@@
-67,15
+67,15
@@
test_expect_success \
'swap file0 and file1' \
'rm -f file0 file1 &&
git-read-tree -m $tree &&
'swap file0 and file1' \
'rm -f file0 file1 &&
git-read-tree -m $tree &&
- git-checkout-
cache
-f -u -a &&
+ git-checkout-
index
-f -u -a &&
mv file0 tmp &&
mv file1 file0 &&
mv tmp file1 &&
mv file0 tmp &&
mv file1 file0 &&
mv tmp file1 &&
- git-update-
cache
file0 file1'
+ git-update-
index
file0 file1'
test_expect_success \
'run diff with -B' \
test_expect_success \
'run diff with -B' \
- 'git-diff-
cache
-B "$tree" >current'
+ 'git-diff-
index
-B "$tree" >current'
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 6ff87c4664981e4397625791c8ea3bbb5f2279a3 M100 file0
@@
-88,7
+88,7
@@
test_expect_success \
test_expect_success \
'run diff with -B and -M' \
test_expect_success \
'run diff with -B and -M' \
- 'git-diff-
cache
-B -M "$tree" >current'
+ 'git-diff-
index
-B -M "$tree" >current'
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 file1 file0
@@
-103,11
+103,11
@@
test_expect_success \
'make file0 into something completely different' \
'rm -f file0 &&
ln -s frotz file0 &&
'make file0 into something completely different' \
'rm -f file0 &&
ln -s frotz file0 &&
- git-update-
cache
file0 file1'
+ git-update-
index
file0 file1'
test_expect_success \
'run diff with -B' \
test_expect_success \
'run diff with -B' \
- 'git-diff-
cache
-B "$tree" >current'
+ 'git-diff-
index
-B "$tree" >current'
cat >expected <<\EOF
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
cat >expected <<\EOF
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
@@
-120,7
+120,7
@@
test_expect_success \
test_expect_success \
'run diff with -B' \
test_expect_success \
'run diff with -B' \
- 'git-diff-
cache
-B -M "$tree" >current'
+ 'git-diff-
index
-B -M "$tree" >current'
# This should not mistake file0 as the copy source of new file1
# due to type differences.
# This should not mistake file0 as the copy source of new file1
# due to type differences.
@@
-135,7
+135,7
@@
test_expect_success \
test_expect_success \
'run diff with -M' \
test_expect_success \
'run diff with -M' \
- 'git-diff-
cache
-M "$tree" >current'
+ 'git-diff-
index
-M "$tree" >current'
# This should not mistake file0 as the copy source of new file1
# due to type differences.
# This should not mistake file0 as the copy source of new file1
# due to type differences.
@@
-152,15
+152,15
@@
test_expect_success \
'file1 edited to look like file0 and file0 rename-edited to file2' \
'rm -f file0 file1 &&
git-read-tree -m $tree &&
'file1 edited to look like file0 and file0 rename-edited to file2' \
'rm -f file0 file1 &&
git-read-tree -m $tree &&
- git-checkout-
cache
-f -u -a &&
+ git-checkout-
index
-f -u -a &&
sed -e "s/git/GIT/" file0 >file1 &&
sed -e "s/git/GET/" file0 >file2 &&
rm -f file0
sed -e "s/git/GIT/" file0 >file1 &&
sed -e "s/git/GET/" file0 >file2 &&
rm -f file0
- git-update-
cache
--add --remove file0 file1 file2'
+ git-update-
index
--add --remove file0 file1 file2'
test_expect_success \
'run diff with -B' \
test_expect_success \
'run diff with -B' \
- 'git-diff-
cache
-B "$tree" >current'
+ 'git-diff-
index
-B "$tree" >current'
cat >expected <<\EOF
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
cat >expected <<\EOF
:100644 000000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 0000000000000000000000000000000000000000 D file0
@@
-174,7
+174,7
@@
test_expect_success \
test_expect_success \
'run diff with -B -M' \
test_expect_success \
'run diff with -B -M' \
- 'git-diff-
cache
-B -M "$tree" >current'
+ 'git-diff-
index
-B -M "$tree" >current'
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1
cat >expected <<\EOF
:100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1