summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-29 04:13:16 -0400
committerJeff King <peff@peff.net>2012-10-29 04:13:16 -0400
commite034d1bb927c17a3406a2bdbb8ccf710677a139d (patch)
tree58bc69a25324468d97a49aeb942c938211ccd442 /grep.h
parent58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c (diff)
parent55c61688ea1e41f4a8c26f957bf1bc43cd39ed97 (diff)
downloadgit-e034d1bb927c17a3406a2bdbb8ccf710677a139d.tar.gz
Merge branch 'nd/grep-true-path'
"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
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/grep.h b/grep.h
index 701c78459f..8fc854f400 100644
--- a/grep.h
+++ b/grep.h
@@ -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);