From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Patches generated by "git format-patch -M -B" can't be applied with "git apply"? Date: Mon, 14 Sep 2015 15:32:45 -0700 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Cc: git@vger.kernel.org To: Dan Kegel X-From: git-owner@vger.kernel.org Tue Sep 15 00:32:54 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZbcIv-00017u-4E for gcvg-git-2@plane.gmane.org; Tue, 15 Sep 2015 00:32:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751518AbbINWcs (ORCPT ); Mon, 14 Sep 2015 18:32:48 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33047 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbbINWcr (ORCPT ); Mon, 14 Sep 2015 18:32:47 -0400 Received: by pacex6 with SMTP id ex6so155914383pac.0 for ; Mon, 14 Sep 2015 15:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=0NEII7UtYUlsB9uif3+OltFLvWgGik02IFWuWXSiXWA=; b=P1/89CHazkgIRAw1JcZK/xcLsDfuI0DvUuOcpl1QmjH1A2YFNU2AVjAYmRbxBEWUE5 66cWN5r7gbjhkuum+72Eja+f/OHjA6OcXRk2khWqg580/bLdMO/Zqp6VVtn6cOdf55At wE23mKmGfDWvDcrSZtWOXgHsQrzfb4DlSpFKpf3877N0w5f94K2SRiU+wEE5lX+gsJq2 hjgQyeMljJ8MsXC5m1Uoqc/MUkK5U2o7tvaMvezjXVz4JZ7SP/sqVzZD6NFH1bUM5cBz 6TbipKgKZ/pJ86BEwFChFNpd9Tk/NRCucoQ9oRwfMMS/bA97dsAistI7cK3AB95TVjjL 3ZWg== X-Received: by 10.66.244.230 with SMTP id xj6mr39810654pac.53.1442269967220; Mon, 14 Sep 2015 15:32:47 -0700 (PDT) Received: from localhost ([2620:0:1000:861b:611e:bac9:b978:992c]) by smtp.gmail.com with ESMTPSA id cn4sm18056517pbc.94.2015.09.14.15.32.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Sep 2015 15:32:46 -0700 (PDT) In-Reply-To: (Dan Kegel's message of "Mon, 14 Sep 2015 15:21:11 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Dan Kegel writes: Yes, "diff -M -B" is known to be problematic, unfortunately. It incorrectly creates an irreversible patch under certain conditions. http://thread.gmane.org/gmane.linux.kernel/1879635