grep: --name-only over binary

[git.git] / grep.c

diff --git a/grep.c b/grep.c
index 35c18b7e28fd8f064f4d7759653c77078a2e5672..22639cde2c2ffeb4fc60a1585b88f3524dcf1c7b 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -873,6 +873,10 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                        count++;
                        if (opt->status_only)
                                return 1;
+                       if (opt->name_only) {
+                               show_name(opt, name);
+                               return 1;
+                       }
                        if (opt->count)
                                goto next_line;
                        if (binary_match_only) {
@@ -882,10 +886,6 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                                opt->output(opt, " matches\n", 9);
                                return 1;
                        }
-                       if (opt->name_only) {
-                               show_name(opt, name);
-                               return 1;
-                       }
                        /* Hit at this line.  If we haven't shown the
                         * pre-context lines, we would need to show them.
                         */