Junio C Hamano wrote:
> The 1.6.4 release seems to have been quite solid, and there is no
> brown-paper-bag bugfixes on 'maint' yet ;-).
Found one.
I didn't realize the whole git-am discussion did _not_ result in a
fix being applied. But git-am will currently refuse to apply any
patch from email that does not have "From " or "From: " in the first
three lines of the email. For those of us whose mail servers prepend
many lines of the form:
Received: from XXX ([XXX]) by XXX with Microsoft SMTPSVC(6.0.3790.2825);
Tue, 14 Jul 2009 07:24:06 -0500
Received: by XXX id n6ECJvlh010405; Tue, 14 Jul 2009 07:24:05 -0500
Received: (majordomo@xxxxxxxxxxxxxxx) by vger.kernel.org via listexpand
id S1751929AbZGNMYD (ORCPT <rfc822;XXX@XXX>);
Tue, 14 Jul 2009 08:24:03 -0400
Received: (majordomo@xxxxxxxxxxxxxxx) by vger.kernel.org id S1752103AbZGNMYC
(ORCPT <rfc822;git-outgoing>); Tue, 14 Jul 2009 08:24:02 -0400
Received: from mail-ew0-f226.google.com ([209.85.219.226]:50485 "EHLO
mail-ew0-f226.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1751626AbZGNMYB (ORCPT <rfc822;git@xxxxxxxxxxxxxxx>);
Tue, 14 Jul 2009 08:24:01 -0400
We can not apply any patches saved from email.
I think we should at least do this to fall back to mbox format:
diff --git a/git-am.sh b/git-am.sh
index d64d997..94fa9c9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -187,6 +187,7 @@ check_patch_format () {
patch_format=stgit
;;
*)
+ patch_format=mbox
;;
esac
;;
-brandon
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html