From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: [PATCH] grep: do not do external grep on skip-worktree entries Date: Mon, 11 Jan 2010 08:33:09 -0800 (PST) Message-ID: References: <7vtyv4cpna.fsf@alter.siamese.dyndns.org> <87ljgfgbl0.fsf@catnip.gol.com> <877hrzga16.fsf@catnip.gol.com> <7v3a2mzzg4.fsf@alter.siamese.dyndns.org> <20100104053125.GA5083@coredump.intra.peff.net> <7vbphaquwl.fsf@alter.siamese.dyndns.org> <20100104064408.GA7785@coredump.intra.peff.net> <7vvdf9402f.fsf@alter.siamese.dyndns.org> <7vtyusr4r7.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Miles Bader , Jeff King , Nguyen Thai Ngoc Duy , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Jan 11 17:33:23 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.50) id 1NUNCk-0003E9-HI for gcvg-git-2@lo.gmane.org; Mon, 11 Jan 2010 17:33:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635Ab0AKQdS (ORCPT ); Mon, 11 Jan 2010 11:33:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751476Ab0AKQdS (ORCPT ); Mon, 11 Jan 2010 11:33:18 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:52219 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050Ab0AKQdS (ORCPT ); Mon, 11 Jan 2010 11:33:18 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o0BGXAmc028513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 11 Jan 2010 08:33:11 -0800 Received: from localhost (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o0BGX9nJ015177; Mon, 11 Jan 2010 08:33:09 -0800 X-X-Sender: torvalds@localhost.localdomain In-Reply-To: <7vtyusr4r7.fsf@alter.siamese.dyndns.org> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) X-Spam-Status: No, hits=-5.449 required=5 tests=AWL,BAYES_00,OSDL_HEADER_SUBJECT_BRACKETED,PATCH_SUBJECT_OSDL X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, 11 Jan 2010, Junio C Hamano wrote: > > An ObviouslyRightThing fix is this two-liner. We shouldn't lookahead if > we want to do something more than just skipping when we see an unmatch for > the line we are currently looking at. Ack. Works for me. And with that, I'd love for it to go in, and get rid of the external grep. Performance is now a non-issue (it goes both ways), and the internal grep doesn't have the bug with separators between multi-line greps. And dropping the external one gets rid of all the issues with PATHs, crap 'grep' implementations, and removes actual code. Goodie. Linus