Carlo Marcelo Arenas Belon <carenas@xxxxxxxxxxxxxx> writes: > On Mon, Sep 07, 2009 at 12:37:30PM -0700, Junio C Hamano wrote: >> >> How does your patch help when the user has GREP_OPTIONS=-C3 in the >> environment? > > It wouldn't help but at least wouldn't break aborting with an script > error since you will always get a number. That's actually worse, don't you think? It is trying to count how many actions are done and how many are remaining, and if you miscount it in that shell function, you will get incorrect result. The function happens to be merely for reporting, but the point is that it is better to fail loudly than doing wrong thing. >> I think a saner workaround for this user environment bug (or GNU grep >> misfeature) is to unset GREP_OPTIONS at the beginning of the script, or >> even in git-sh-setup. > > agree, and since grep is used almost everywhere filtering in git-sh-setup > like CDPATH is makes sense, with the only user of grep that wouldn't > benefit from that being git-mergetool--lib.sh AFAIK. Not at all. "git grep" itself will be broken. See my other patch for a possible alternative approach. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html