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:49 -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:59 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 1ZbcIz-0001Ej-Uh for gcvg-git-2@plane.gmane.org; Tue, 15 Sep 2015 00:32:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751629AbbINWcx (ORCPT ); Mon, 14 Sep 2015 18:32:53 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:36396 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbbINWcw (ORCPT ); Mon, 14 Sep 2015 18:32:52 -0400 Received: by padhk3 with SMTP id hk3so155424623pad.3 for ; Mon, 14 Sep 2015 15:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=PXnSdbhLqnvZz0GyMQV+VpHepwE30TjZAP1m0l1Hc9o=; b=yhSHLpe6x4+ysuQIQ8qI4alNadEVxF87bcF/Kji0tmPqLicnrjvf2DMvVElhIsF+sE 2e/frc/dTinBw2a/x9F1IpeiTdeQBkVDO28sHrsIcDZinOT4u3TR+GJTDEosj2Z/OjAH u9nNU1sT24W7JW5QyvrvHNHiChda9BYKJYmbr0co5GQmyfr5Uel7PAe8oaF45KiDcr4X 1gI3dskTzetJXNLEmqq/PUIMohoNh2Lhrmf/BoJU+Hd2y8obABtNOdasjoyvvZculuaD o+JmmkeGCLVfwktrA3lj86z6Elyw5yE4DAdFPp/6ZiknjIUWZ6Z0OAc8FBoq2ZbIRjk1 kLjA== X-Received: by 10.66.234.138 with SMTP id ue10mr40145488pac.9.1442269971524; Mon, 14 Sep 2015 15:32:51 -0700 (PDT) Received: from localhost ([2620:0:1000:861b:611e:bac9:b978:992c]) by smtp.gmail.com with ESMTPSA id rz10sm18189531pab.42.2015.09.14.15.32.50 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Sep 2015 15:32:51 -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: 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