@matheusbsbs / matheus-bagliano / commits / fcfe34b5ac
Fork 0

git-grep: fix exit code when we use external grep.

Upon hit, we should exit with status 0. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jul 4, 2006 at 02:43 UTC fcfe34b5ace3e75d37c462712c7103e39cdb1fbc
1 file changed +10 -5
builtin-grep.c
+10 -5
@@ -446,7 +446,7 @@ static int exec_grep(int argc, const char **argv)
446
447 static int external_grep(struct grep_opt *opt, const char **paths, int cached)
448 {
449 - int i, nr, argc, hit, len;
449 + int i, nr, argc, hit, len, status;
450 const char *argv[MAXARGS+1];
451 char randarg[ARGBUF];
452 char *argptr = randarg;
@@ -536,12 +536,17 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
536 argv[argc++] = name;
537 if (argc < MAXARGS)
538 continue;
539 - hit += exec_grep(argc, argv);
539 + status = exec_grep(argc, argv);
540 + if (0 < status)
541 + hit = 1;
542 argc = nr;
543 }
542 - if (argc > nr)
543 - hit += exec_grep(argc, argv);
544 - return 0;
544 + if (argc > nr) {
545 + status = exec_grep(argc, argv);
546 + if (0 < status)
547 + hit = 1;
548 + }
549 + return hit;
550 }
551
552 static int grep_cache(struct grep_opt *opt, const char **paths, int cached)