From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Alan" Subject: Problems with git am Date: Mon, 26 Oct 2009 17:12:09 -0700 (PDT) Message-ID: <59976.134.134.139.70.1256602329.squirrel@clueserver.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Oct 27 01:22:25 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1N2ZpP-0007Xt-2n for gcvg-git-2@lo.gmane.org; Tue, 27 Oct 2009 01:22:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755297AbZJ0AWN (ORCPT ); Mon, 26 Oct 2009 20:22:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755059AbZJ0AWM (ORCPT ); Mon, 26 Oct 2009 20:22:12 -0400 Received: from clueserver.org ([65.102.45.174]:46216 "EHLO clueserver.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754828AbZJ0AWM (ORCPT ); Mon, 26 Oct 2009 20:22:12 -0400 X-Greylist: delayed 608 seconds by postgrey-1.27 at vger.kernel.org; Mon, 26 Oct 2009 20:22:12 EDT Received: by clueserver.org (Postfix, from userid 48) id CE615F5055A; Mon, 26 Oct 2009 17:12:09 -0700 (PDT) Received: from 134.134.139.70 (SquirrelMail authenticated user alan) by clueserver.org with HTTP; Mon, 26 Oct 2009 17:12:09 -0700 (PDT) User-Agent: SquirrelMail/1.4.10a-1.fc6 X-Priority: 3 (Normal) Importance: Normal Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I am encountering an interesting issue. I am not certain if I am doing something wrong or I am encountering a bug or what. I am using Git version 1.6.0.6 from Fedora 9. I am not using the current version because it has changed how it errors out. (If git does not understand the patch, instead of exiting with an error code that xargs will fail on it exits with something non-fatal.) I have a number of patches that I have been handed to apply to a git tree. The patches have been generated by git, but have not been e-mailed. (They may have been extracted from gitweb or some other source.) The header of the patch looks like: commit 62b266585bb5555d44a764c90d80f9c4bb8188c1 Author: Joe Example Date: Wed Sep 19 10:03:47 2009 -0600 There is no e-mail line, but it has the information for e-mail address. If I apply this patch it will error out with: "Patch does not have a valid e-mail address." If I use a current version of Git it errors out with a message "Cannot determine patch format", but does not issue a fatal error code. If I use git-apply on this patch, it applies it to the tree, but does not commit it. (I need the comments and signoffs to remain intact.) I have to cut-and-paste the commit information to keep it. (I am working on an automated process to handle these patches and don' want to have to reinvent git-am.) Am i doing something wrong here? My goal is to be able to take whatever patch I am handed and apply it to the current tree. If it is a raw diff, I can handle that. What concerns me are these patches that look like they are generated by git, but which do not apply cleanly with git-am. Is there some sort of instructions for applying patches that are dumped out using "git-show" or some other mechanism? I am not finding this process documented anywhere. (If it is, it is pretty well hidden.) Thanks!