Merge branch 'lt/grep' into next

diff --git a/diff-index.c b/diff-index.c
index 4a243b36248362c4627a34957703fba33cb885eb..8c9f60173b18a68f6ea224b2e6fc9c0eab4b9d0f 100644 (file)
--- a/diff-index.c
+++ b/diff-index.c
@@ -11,7 +11,6 @@ COMMON_DIFF_OPTIONS_HELP;
 int main(int argc, const char **argv)
 {
        struct rev_info rev;
-       int match_missing = 0;
        int cached = 0;
        int i;
 
@@ -23,9 +22,7 @@ int main(int argc, const char **argv)
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                        
-               if (!strcmp(arg, "-m"))
-                       match_missing = 1; 
-               else if (!strcmp(arg, "--cached"))
+               if (!strcmp(arg, "--cached"))
                        cached = 1;
                else
                        usage(diff_cache_usage);
@@ -37,5 +34,5 @@ int main(int argc, const char **argv)
        if (!rev.pending_objects || rev.pending_objects->next ||
            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
-       return run_diff_index(&rev, cached, match_missing);
+       return run_diff_index(&rev, cached);
 }