From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] apply: fix copy/rename breakage Date: Wed, 09 Jul 2008 20:13:04 -0700 Message-ID: <7vtzeyqvnj.fsf@gitster.siamese.dyndns.org> References: <7vy74aqvr1.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linus Torvalds , Don Zickus To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jul 10 05:14:10 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 1KGmbh-00026l-5g for gcvg-git-2@gmane.org; Thu, 10 Jul 2008 05:14:09 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481AbYGJDNL (ORCPT ); Wed, 9 Jul 2008 23:13:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752326AbYGJDNL (ORCPT ); Wed, 9 Jul 2008 23:13:11 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:39197 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbYGJDNK (ORCPT ); Wed, 9 Jul 2008 23:13:10 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id A93FF1E3BA; Wed, 9 Jul 2008 23:13:09 -0400 (EDT) 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-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id F3D2A1E3B7; Wed, 9 Jul 2008 23:13:05 -0400 (EDT) In-Reply-To: <7vy74aqvr1.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 09 Jul 2008 20:10:58 -0700") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 1F9CC532-4E2E-11DD-BAF9-CE28B26B55AE-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Recently, 7ebd52a (Merge branch 'dz/apply-again', 2008-07-01) taught > "git-apply" to grok a (non-git) patch that is a concatenation of separate > patches that touch the same file number of files, by recording the Eh, s/files/times/; > postimage of patch application of previous round and using it as the > preimage for later rounds. > > However, this "incremental" mode of patch application contradicts with the > way git rename/copy patches are fundamentally designed.... > a patch to produce new files out of existing file by copying to fix this > issue. > > Signed-off-by: Junio C Hamano > --- > > * Applies to 'master'. I am CC'ing Linus not because he is in any way > responsible for this breakage, but because this breakage can affect > heavy users of "git apply".