mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/grep-true-path'

Browse Source 
"git grep -e pattern <tree>" asked the attribute system to read
"<tree>:.gitattributes" file in the working tree, which was
nonsense.

* nd/grep-true-path:
  grep: stop looking at random places for .gitattributes
This commit is contained in:
Jeff King
2012-10-29 04:13:16 -04:00
parent 58f3f9893d 55c61688ea
commit e034d1bb92
4 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grep.h
View File

@ -164,11 +164,13 @@ struct grep_source {
char *buf;
unsigned long size;
char *path; /* for attribute lookups */
struct userdiff_driver *driver;
};
void grep_source_init(struct grep_source *gs, enum grep_source_type type,
const char *name, const void *identifier);
const char *name, const char *path,
const void *identifier);
void grep_source_clear_data(struct grep_source *gs);
void grep_source_clear(struct grep_source *gs);
void grep_source_load_driver(struct grep_source *gs);