Re: PATCH: vc-git-grep: force git-grep to disable color and pager

[Mitchel Humpherys <mitch.special@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

On Wed, Sep 25, 2013 at 10:08 AM, Davis Herring <herring@lanl.gov> wrote:
>> This commit adds some command line options to the invocation of `git'
>> in `vc-git-grep' so that git disables all coloring and paging. Without
>> this, I get a warning about my "terminal" not being fully functional
>> and git-grep attempts to use a pager (which means the git-grep process
>> never finishes):
>>
>>     git grep -n -e stuff -- *
>>     WARNING: terminal is not fully functional
>>      CREDITS:14:D: Alpha systems hacking, IPv6 and other network related stuff
>>     <snip>
>>     :  <-- pager waiting for me to do something
>
> All this (including the warning) is the use of less, not the coloring
> (although git might in theory complain if you try to use coloring with
> no TERM variable or so).  I'd recommend using --no-pager but trying to
> interpret the color rather than suppressing it.
>
> Davis
>

You're absolutely right. I've removed the --no-color flag in this
version and confirmed that highlighting works in the *grep* results
buffer.

Thanks,
Mitch


-- 
"if i had more time i would have written a shorter letter."
--Pascal

[-- Attachment #2: vc-git-grep-V2.txt --]
[-- Type: text/plain, Size: 2309 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mitch.special@gmail.com-20130926051315-t1szt102wbdakjwb
# target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/
# testament_sha1: d5a1d14cfa74d5c777fdca663051b7acbde0815d
# timestamp: 2013-09-25 22:15:32 -0700
# base_revision_id: eggert@cs.ucla.edu-20130925034434-wbwf8chwg0tj5w40
# 
# Begin patch
=== modified file 'lisp/vc/vc-git.el'
--- lisp/vc/vc-git.el	2013-09-12 05:45:42 +0000
+++ lisp/vc/vc-git.el	2013-09-26 05:13:15 +0000
@@ -1082,7 +1082,7 @@
 	      (setq command nil))
 	(setq dir (file-name-as-directory (expand-file-name dir)))
 	(setq command
-	      (grep-expand-template "git grep -n -e <R> -- <F>"
+	      (grep-expand-template "git --no-pager grep -n -e <R> -- <F>"
                                     regexp files))
 	(when command
 	  (if (equal current-prefix-arg '(4))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRVSxGQAAZDfgBAwUGf/91dC
EIC////wUAPOnnRedxR0AGSEmUe0aJ6psm0T1E9RkxNA009QAaRTE9TxNTTwpp6gaAAAAAGiKeno
o9J6T1A0NAAAAAAip+TUmTBMTAmRowgwE0GQBJITI0TaTQ0NT0Q0Jk9Kekek2kM1FrbzqumTnVuF
tvUXJU31QAPZRcy7rVJWX8R8Mz5dLLOViIIH20aTUEJQIhCRdd65RAkff7iOQGkUrjgEhJCBAFVT
RQrD41uFatfPeVXKKIExTCfHSwbWjC76PyDFQzSwlFjUZk3uF8dgOuHedV8mgm80l9JMpdVRHCmQ
FNSuAVacBnMI06yICwxToj/oJ28ssHyN2qxRLnMgyqIpoBBxUz38lRXShdBVnHo7XwF7RV2Z5Ydu
OowkqpQugKTggtoJAPZmKqw4FAWp1asQXHQgUNlDKnwhRSCMnib2SHk20xrVTCcYG3bqMZhIkKI8
RbNyThiFyZTHmsdpUWD/3J1FnYv2siwuZU4zLFVy0alpM4ld5AWEVkXLGQoVvjSrJjGm24q/R4n6
VuoUZ8mIuntsDWEh3xKoMTIHCWqAWslpClAwuqWoxiaJzyHMUGCnUkfRK8kjBA0ReQJgqhLE7XMl
C1E0HMqdzEpAV4GiRWGLIwjVSBwDXHaG8HgdNHOajo5evG1xWSJTQ1AgyxWvo5ilzU5iOW9g7Gl9
65cwGkXSQk/p+L2ebOAFRUlfmLWeoDYy2fFlGRPFi1pcuGPh5o7t8MTj5OiLiWOw03PXybgZeh6U
83PHmlRXml2Ma1ySvgSX1SpgVf4p+7FjZY93XK/skopsiCyF1J0p3lcr17MZdPbwc0yZ/ZwU12E4
3bcVpSqecCOhzidkTMICEKA83xMLaJy62TU+HGww+h0TJeO4bhHBoKV5z9+OZaHOxPy4dh5JzzsM
7jPrp0+8HERh1LV0S3LNf1LYd5X5gThUeuEgOraBwWD9GeMuu1YQIJUL43/KaPccdyTJ5iacAYxC
HxbMlwBsD6veQCS+CoIvv471TKK5igCvFECBFSZlySYJhNwQSithH0Yz+O+XDmWs3slv+7Jd5Nq+
Vw/4LhodudtcDU/YdLR6TXOlFlAIwHKObS8iEUMyo5aSe2lZr4IJ1pfV8CQe01m9Tv9/Ggbb6N67
nMoGvmlKcIsasq3y1D4VmTKwOcIIyCPK4k+vtenbH3vCANTZvpCvCCdF8Ca2W1A0V570oSUkdRPx
vc7Y69lmLUKrNVcDCQFQ+NDnuO5glLVbQft+ydI1BeG+tyqnuXMh2P3rH89pT5dfjzb7GvHLwbBc
giuHkj4E2tbV4pjcc+Ewzmxng51RVtFKf/i7kinChICqliMg