From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Memory overrun in http-push.c Date: Thu, 01 Mar 2007 04:08:20 -0800 Message-ID: <7vr6s9qi8b.fsf@assigned-by-dhcp.cox.net> References: <20070228151516.GC57456@codelabs.ru> <81b0412b0703010015l5c91c68pd4748ae379db98bb@mail.gmail.com> <7vslcpux62.fsf@assigned-by-dhcp.cox.net> <200703011040.35971.andyparkins@gmail.com> <20070228151516.GC57456@codelabs.ru> <200702281541.41164.andyparkins@gmail.com> <20070301051323.GG57456@codelabs.ru> <81b0412b0703010015l5c91c68pd4748ae379db98bb@mail.gmail.com> <7vslcpux62.fsf@assigned-by-dhcp.cox.net> <20070301120042.GD63606@codelabs.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Andy Parkins , Alex Riesen , git@vger.kernel.org, Johannes Schindelin To: Eygene Ryabinkin X-From: git-owner@vger.kernel.org Thu Mar 01 13:08:31 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HMk5F-00037a-6e for gcvg-git@gmane.org; Thu, 01 Mar 2007 13:08:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965036AbXCAMIW (ORCPT ); Thu, 1 Mar 2007 07:08:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965034AbXCAMIW (ORCPT ); Thu, 1 Mar 2007 07:08:22 -0500 Received: from fed1rmmtao101.cox.net ([68.230.241.45]:51511 "EHLO fed1rmmtao101.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965036AbXCAMIV (ORCPT ); Thu, 1 Mar 2007 07:08:21 -0500 Received: from fed1rmimpo02.cox.net ([70.169.32.72]) by fed1rmmtao101.cox.net (InterMail vM.7.05.02.00 201-2174-114-20060621) with ESMTP id <20070301120822.QVCE748.fed1rmmtao101.cox.net@fed1rmimpo02.cox.net>; Thu, 1 Mar 2007 07:08:22 -0500 Received: from assigned-by-dhcp.cox.net ([68.5.247.80]) by fed1rmimpo02.cox.net with bizsmtp id VQ8L1W00N1kojtg0000000; Thu, 01 Mar 2007 07:08:21 -0500 In-Reply-To: <20070301120042.GD63606@codelabs.ru> (Eygene Ryabinkin's message of "Thu, 1 Mar 2007 15:00:42 +0300") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Eygene Ryabinkin writes: > Good day! > >> was more annoyed by the fact that the patch was an attachment, >> than it was generated by diff without leading a/ and b/ paths. > > So, git is unable to use this type of patches directly and I will > need to do > $ patch < patchfile > $ rm file.orig > $ git commit In case it was unclear, I was saying that "attachment was more annoying" than "diff output that does not follow the established convention to be applied with patch -p1". Both I can handle, but dealing with the former is more work for me.