4 files changed, 38 insertions, 172 deletions
diff --git a/t/t3010-ls-files-killed.sh b/t/t3010-ls-files-killed-modified.sh
index 2e18baae5a..5fc1976711 100755
--- a/t/t3010-ls-files-killed.sh
+++ b/t/t3010-ls-files-killed-modified.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-ls-files -k flag test.
+test_description='git-ls-files -k and -m flags test.
 
 This test prepares the following in the cache:
 
@@ -24,6 +24,16 @@ and the following on the filesystem:
 
 git-ls-files -k should report that existing filesystem
 objects except path4, path5 and path6/file6 to be killed.
+
+Also for modification test, the cache and working tree have:
+
+    path7       - an empty file, modified to a non-empty file.
+    path8       - a non-empty file, modified to an empty file.
+    path9	- an empty file, cache dirtied.
+    path10	- a non-empty file, cache dirtied.
+
+We should report path0, path1, path2/file2, path3/file3, path7 and path8
+modified without reporting path9 and path10.
 '
 . ./test-lib.sh
 
@@ -32,11 +42,15 @@ ln -s xyzzy path1
 mkdir path2 path3
 date >path2/file2
 date >path3/file3
+: >path7
+date >path8
+: >path9
+date >path10
 test_expect_success \
     'git-update-index --add to add various paths.' \
-    "git-update-index --add -- path0 path1 path?/file?"
+    "git-update-index --add -- path0 path1 path?/file? path7 path8 path9 path10"
 
-rm -fr path?
+rm -fr path? ;# leave path10 alone
 date >path2
 ln -s frotz path3
 ln -s nitfol path5
@@ -44,6 +58,10 @@ mkdir path0 path1 path6
 date >path0/file0
 date >path1/file1
 date >path6/file6
+date >path7
+: >path8
+: >path9
+touch path10
 
 test_expect_success \
     'git-ls-files -k to show killed files.' \
@@ -58,4 +76,21 @@ EOF
 test_expect_success \
     'validate git-ls-files -k output.' \
     'diff .output .expected'
+
+test_expect_success \
+    'git-ls-files -m to show modified files.' \
+    'git-ls-files -m >.output'
+cat >.expected <<EOF
+path0
+path1
+path2/file2
+path3/file3
+path7
+path8
+EOF
+
+test_expect_success \
+    'validate git-ls-files -m output.' \
+    'diff .output .expected'
+
 test_done
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 91015d76fc..f3b6330a9b 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -50,13 +50,4 @@ test_expect_success \
     'validate git-diff-files -p output.' \
     'cmp -s current expected'
 
-test_expect_success \
-    'build same diff using git-diff-helper.' \
-    'git-diff-files -z | git-diff-helper -z >current'
-
-
-test_expect_success \
-    'validate git-diff-helper output.' \
-    'cmp -s current expected'
-
 test_done
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 5636f4f2cd..684fd23a41 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -40,38 +40,6 @@ test_expect_success \
     'validate output from rename/copy detection (#1)' \
     'compare_diff_raw current expected'
 
-# make sure diff-helper can grok it.
-mv expected diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-diff --git a/COPYING b/COPYING.2
-rename from COPYING
-rename to COPYING.2
---- a/COPYING
-+++ b/COPYING.2
-@@ -2 +2 @@
-- Note that the only valid version of the GPL as far as this project
-+ Note that the only valid version of the G.P.L as far as this project
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
-@@ -12 +12 @@
--	This file is licensed under the GPL v2, or a later version
-+	This file is licensed under the G.P.L v2, or a later version
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#1)' \
-    'compare_diff_patch current expected'
-
 ################################################################
 
 test_expect_success \
@@ -94,36 +62,6 @@ test_expect_success \
     'validate output from rename/copy detection (#2)' \
     'compare_diff_raw current expected'
 
-# make sure diff-helper can grok it.
-mv expected diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING
---- a/COPYING
-+++ b/COPYING
-@@ -2 +2 @@
-- Note that the only valid version of the GPL as far as this project
-+ Note that the only valid version of the G.P.L as far as this project
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
-@@ -12 +12 @@
--	This file is licensed under the GPL v2, or a later version
-+	This file is licensed under the G.P.L v2, or a later version
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#2)' \
-    'compare_diff_patch current expected'
-
 ################################################################
 
 # tree has COPYING and rezrov.  work tree has the same COPYING and
@@ -145,22 +83,4 @@ test_expect_success \
     'validate output from rename/copy detection (#3)' \
     'compare_diff_raw current expected'
 
-# make sure diff-helper can grok it.
-mv expected diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#3)' \
-    'compare_diff_patch current expected'
-
 test_done
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index ea811529cc..2f2f8b1216 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -44,38 +44,6 @@ test_expect_success \
     'validate output from rename/copy detection (#1)' \
     'compare_diff_raw_z current expected'
 
-# make sure diff-helper can grok it.
-mv current diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-diff --git a/COPYING b/COPYING.2
-rename from COPYING
-rename to COPYING.2
---- a/COPYING
-+++ b/COPYING.2
-@@ -2 +2 @@
-- Note that the only valid version of the GPL as far as this project
-+ Note that the only valid version of the G.P.L as far as this project
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
-@@ -12 +12 @@
--	This file is licensed under the GPL v2, or a later version
-+	This file is licensed under the G.P.L v2, or a later version
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#1)' \
-    'compare_diff_patch current expected'
-
 ################################################################
 
 test_expect_success \
@@ -101,36 +69,6 @@ test_expect_success \
     'validate output from rename/copy detection (#2)' \
     'compare_diff_raw_z current expected'
 
-# make sure diff-helper can grok it.
-mv current diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING
---- a/COPYING
-+++ b/COPYING
-@@ -2 +2 @@
-- Note that the only valid version of the GPL as far as this project
-+ Note that the only valid version of the G.P.L as far as this project
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ HOWEVER, in order to allow a migration to G.P.Lv3 if that seems like
-@@ -12 +12 @@
--	This file is licensed under the GPL v2, or a later version
-+	This file is licensed under the G.P.L v2, or a later version
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#2)' \
-    'compare_diff_patch current expected'
-
 ################################################################
 
 # tree has COPYING and rezrov.  work tree has the same COPYING and
@@ -154,22 +92,4 @@ test_expect_success \
     'validate output from rename/copy detection (#3)' \
     'compare_diff_raw_z current expected'
 
-# make sure diff-helper can grok it.
-mv current diff-raw
-GIT_DIFF_OPTS=--unified=0 git-diff-helper -z <diff-raw >current
-cat >expected <<\EOF
-diff --git a/COPYING b/COPYING.1
-copy from COPYING
-copy to COPYING.1
---- a/COPYING
-+++ b/COPYING.1
-@@ -6 +6 @@
-- HOWEVER, in order to allow a migration to GPLv3 if that seems like
-+ However, in order to allow a migration to GPLv3 if that seems like
-EOF
-
-test_expect_success \
-    'validate output from diff-helper (#3)' \
-    'compare_diff_patch current expected'
-
 test_done