# [PATCH] grep: do not skip unmerged entries when grepping in the working tree. 3 messages from 2006-11-26 to 2006-11-26. Participants: Junio C Hamano, Johannes Sixt. Thread: https://gitlist.dev/t/43497 ## Johannes Sixt, 2006-11-26 14:53 Subject: git-grep misses an instance of a string (after conflict) Message-ID: URL: https://gitlist.dev/e/ekc9q7%2436e%241%40sea.gmane.org ``` I've roughly had the following sequence of operations on a particular file in my project: 1. git-cherry-pick a commit, which resulted in a conflict in in that file 2. edit the file to insert a particular string (which wasn't there before) 3. then: $ git-grep getSibling -- kdbg/exprwnd.h # this file had a conflict $ grep getSibling -- kdbg/exprwnd.h { return static_cast(getSibling()); } $ git-update-index kdbg/exprwnd.h $ git-grep getSibling -- kdbg/exprwnd.h kdbg/exprwnd.h: { return static_cast(getSibling()); } As you can see, the first git-grep doesn't find the string, but after the update-index, it does find it. This is unexpected behavior, in particular since the manual page talks about git-grep to search the working tree. I understand that the conflict may have influenced the behavior, but the manual page is not in line with the behavior. Am I missing something? -- Hannes ``` ## Junio C Hamano, 2006-11-26 20:49 Subject: [PATCH] grep: do not skip unmerged entries when grepping in the working tree. Message-ID: <7vvel2rl05.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vvel2rl05.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` We used to skip unmerged entries, which made sense for grepping in the cached copies, but not for grepping in the files on the working tree. Noticed by Johannes Sixt. Signed-off-by: Junio C Hamano --- Johannes Sixt writes: > $ git-grep getSibling -- kdbg/exprwnd.h # this file had a conflict > $ grep getSibling -- kdbg/exprwnd.h > { return static_cast(getSibling()); } > $ git-update-index kdbg/exprwnd.h > $ git-grep getSibling -- kdbg/exprwnd.h > kdbg/exprwnd.h: { return static_cast(getSibling()); } This is because unmerged entries were ignored. builtin-grep.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/builtin-grep.c b/builtin-grep.c index ad7dc00..9873e3d 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -268,7 +268,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; char *name; - if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode))) + if (!S_ISREG(ntohl(ce->ce_mode))) continue; if (!pathspec_matches(paths, ce->name)) continue; @@ -280,12 +280,19 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) memcpy(name + 2, ce->name, len + 1); } argv[argc++] = name; - if (argc < MAXARGS) + if (argc < MAXARGS && !ce_stage(ce)) continue; status = exec_grep(argc, argv); if (0 < status) hit = 1; argc = nr; + if (ce_stage(ce)) { + do { + i++; + } while (i < active_nr && + !strcmp(ce->name, active_cache[i]->name)); + i--; /* compensate for loop control */ + } } if (argc > nr) { status = exec_grep(argc, argv); @@ -316,14 +323,24 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached) for (nr = 0; nr < active_nr; nr++) { struct cache_entry *ce = active_cache[nr]; - if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode))) + if (!S_ISREG(ntohl(ce->ce_mode))) continue; if (!pathspec_matches(paths, ce->name)) continue; - if (cached) + if (cached) { + if (ce_stage(ce)) + continue; hit |= grep_sha1(opt, ce->sha1, ce->name, 0); + } else hit |= grep_file(opt, ce->name); + if (ce_stage(ce)) { + do { + nr++; + } while (nr < active_nr && + !strcmp(ce->name, active_cache[nr]->name)); + nr--; /* compensate for loop control */ + } } free_grep_patterns(opt); return hit; -- 1.4.4.1.ge3fb ``` ## Johannes Sixt, 2006-11-26 21:30 Subject: Re: [PATCH] grep: do not skip unmerged entries when grepping in the working tree. Message-ID: <200611262230.01948.johannes.sixt@telecom.at> URL: https://gitlist.dev/e/200611262230.01948.johannes.sixt%40telecom.at In-Reply-To: <7vvel2rl05.fsf@assigned-by-dhcp.cox.net> ``` On Sunday 26 November 2006 21:49, Junio C Hamano wrote: > We used to skip unmerged entries, which made sense for grepping > in the cached copies, but not for grepping in the files on the > working tree. > > Noticed by Johannes Sixt. > > Signed-off-by: Junio C Hamano This fixes my problem. Thanks! ```