Here's a reroll, with the following changes: * Use "honor" for obey".
* Fixed the issue with --textconv and non-blobs. * Restructured tests as per Jeff's preference. * Added 7/ which flips the default for git grep to textconv. Jeff King (1): grep: allow to use textconv filters Michael J Gruber (6): t4030: demonstrate behavior of show with textconv show: obey --textconv for blobs cat-file: do not die on --textconv without textconv filters t7008: demonstrate behavior of grep with textconv grep: honor --textconv for the case rev:path git grep: honor textconv by default Documentation/git-grep.txt | 9 +++- builtin/cat-file.c | 18 ++++---- builtin/grep.c | 13 +++--- builtin/log.c | 24 ++++++++-- grep.c | 102 +++++++++++++++++++++++++++++++++++++------ grep.h | 1 + object.c | 26 ++++++++--- object.h | 2 + t/t4030-diff-textconv.sh | 18 ++++++++ t/t7008-grep-binary.sh | 43 ++++++++++++++++++ t/t8007-cat-file-textconv.sh | 20 +++------ 11 files changed, 222 insertions(+), 54 deletions(-) -- 1.8.2.1.799.g1ac2534 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
