summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-23 13:21:30 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-23 13:21:31 -0700
commit4197361e39a304df30cc492122dbdfe90ae8af0e (patch)
treee64abbced7f07dab484262d7c0dab12af1abe2d0 /object.h
parenteeb8e8373f68b706f5fc8a00760c3dedf239db70 (diff)
parentafa15f3cd8f4cbf9572138329be374ff8566b10a (diff)
downloadgit-4197361e39a304df30cc492122dbdfe90ae8af0e.tar.gz
Merge branch 'mg/more-textconv'
Make "git grep" and "git show" pay attention to --textconv when dealing with blob objects. * mg/more-textconv: grep: honor --textconv for the case rev:path grep: allow to use textconv filters t7008: demonstrate behavior of grep with textconv cat-file: do not die on --textconv without textconv filters show: honor --textconv for blobs diff_opt: track whether flags have been set explicitly t4030: demonstrate behavior of show with textconv
Diffstat (limited to 'object.h')
-rw-r--r--object.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/object.h b/object.h
index 2ff68c52dd..dc5df8ce1d 100644
--- a/object.h
+++ b/object.h
@@ -19,6 +19,7 @@ struct object_array {
*/
char *name;
unsigned mode;
+ struct object_context *context;
} *objects;
};
@@ -91,6 +92,7 @@ int object_list_contains(struct object_list *list, struct object *obj);
/* Object array handling .. */
void add_object_array(struct object *obj, const char *name, struct object_array *array);
void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode);
+void add_object_array_with_context(struct object *obj, const char *name, struct object_array *array, struct object_context *context);
typedef int (*object_array_each_func_t)(struct object_array_entry *, void *);