[PATCH/RFC] Fix the result of "git grep -l -C <num>"

From: Albert Yale <surfingalbert@gmail.com>
Date: Jan 23, 2012, 16:01 UTC
Message-ID: <1327334484-35196-1-git-send-email-surfingalbert@gmail.com>

When combining "git grep -l" with "-C <num>", the first result is omitted.

Signed-off-by: Albert Yale <surfingalbert@gmail.com>
---
For example, if the following command should output a list of 3
different files (a.txt, b.txt, c.txt):

$ git grep -l -C 1 albert_yale b.txt c.txt

The first result (a.txt) will be missing.

Understandably, you wouldn't normally use "-C" with "-l", but the output should still be correct.

My solution is to take "opt.name_only" into account before setting "skip_first_line" in grep.c.

I've reproduced this bug with git version 1.7.8.3 and git version 1.7.9.rc2, both under Mac OS X 10.7.2.

Albert Yale

 builtin/grep.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/builtin/grep.c b/builtin/grep.c
index 9ce064a..076de21 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1036,7 +1036,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	if (use_threads) {
 		if (opt.pre_context || opt.post_context || opt.file_break ||
 		    opt.funcbody)
-			skip_first_line = 1;
+		{
+			if( ! opt.name_only )
+				skip_first_line = 1;
+		}
 		start_threads(&opt);
 	}
 #endif

-- 
1.7.8.3