Merge master into rc

diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
old mode 100644 (file)
new mode 100755 (executable)
index ab83ea3..042390a
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -45,7 +45,7 @@ test_expect_success \
 git-diff-cache -C $tree path1 >current
 
 cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 N     path1/COPYING
+:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A     path1/COPYING
 EOF
 
 test_expect_success \
@@ -80,7 +80,7 @@ test_expect_success \
 git-diff-cache -C $tree path1 >current
 
 cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 N     path1/COPYING
+:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A     path1/COPYING
 EOF
 
 test_expect_success \