From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH v2] Do not show "diff --git" metainfo with --no-prefix Date: Wed, 16 Jan 2008 16:57:20 -0800 Message-ID: <7vprw1mfpr.fsf@gitster.siamese.dyndns.org> References: <7vhched3kw.fsf@gitster.siamese.dyndns.org> <7v4pded1rk.fsf_-_@gitster.siamese.dyndns.org> <7v7iiabjyh.fsf_-_@gitster.siamese.dyndns.org> <7v1w8hploy.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linus Torvalds , Chris Ortman , Johannes Schindelin , git@vger.kernel.org To: Daniel Barkalow X-From: git-owner@vger.kernel.org Thu Jan 17 01:58:14 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JFJ56-0003on-1y for gcvg-git-2@gmane.org; Thu, 17 Jan 2008 01:58:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751248AbYAQA5b (ORCPT ); Wed, 16 Jan 2008 19:57:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751080AbYAQA5a (ORCPT ); Wed, 16 Jan 2008 19:57:30 -0500 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:47114 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbYAQA53 (ORCPT ); Wed, 16 Jan 2008 19:57:29 -0500 Received: from a-sasl-quonix (localhost [127.0.0.1]) by a-sasl-quonix.pobox.com (Postfix) with ESMTP id 4EA44439E; Wed, 16 Jan 2008 19:57:28 -0500 (EST) Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.pobox.com (Postfix) with ESMTP id 7BBF6439B; Wed, 16 Jan 2008 19:57:22 -0500 (EST) In-Reply-To: (Daniel Barkalow's message of "Wed, 16 Jan 2008 15:39:10 -0500 (EST)") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Daniel Barkalow writes: > On Wed, 16 Jan 2008, Junio C Hamano wrote: > >> Linus Torvalds writes: >> >> > That's why tying "--git" together with any prefix handling is wrong: >> > because it's a totally different issue. It's true that "git-apply" right >> > now doesn't understand these things, but assuming we want to teach >> > git-apply to apply to subprojects eventually (we do, don't we?) we'll >> > eventually have to teach it. >> >> That's all correct but >> >> * currently diff does not recurse, nor apply does not apply >> recursively; >> >> * "git diff" that comes with 1.5.4, if we do not do anything, >> can produce a diff that will be rejected by the stricter >> check "git apply" has when used with --no-prefix and friends; >> >> * submodule aware versions of "git diff" can be told to add >> "--mark-as-git-diff" when it passes "--src-prefix=a/git-gui" >> and "--dst-prefix=b/git-gui" when it recurses internally, to >> defeat what my proposed patch does. > > Or it could pass an option to include the intermediate portion as part of > the name rather than as part of the prefixes. And git-apply would probably > be a lot happier to have confirmation that certain files are supposed to > be from a submodule, which could be handled by including that option in > the header after --git. Yeah, I guess we can solve it that way. In either case that's a future thing. An important point for me in this discussion is to agree that the current --no-prefix that claims to be "diff --git" is not safe for release and come to consensus that we need a fix.