{"thread":{"id":"9178","subject":"git-apply and git-am should provide better errors when changelog is missing","startedAt":"2007-07-23T17:15:13Z","lastAt":"2007-07-23T17:15:13Z","messageCount":1,"participants":["Timur Tabi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"48319","messageId":"46A4E221.9050302@freescale.com","threadId":"9178","inReplyTo":null,"subject":"git-apply and git-am should provide better errors when changelog is missing","fromName":"Timur Tabi","fromEmail":"timur@freescale.com","sentAt":"2007-07-23T17:15:13Z","receivedAt":"2007-07-23T17:15:13Z","isPatch":false,"sender":{"key":"timur@freescale.com","avatar":null},"body":"I was trying to apply a patch, and I kept getting this odd error:\n\nI'm trying to apply a patch, and I get this error message:\n\ngit-apply --stat mpc86xx.patch\nfatal: git-apply: bad git-diff - expected /dev/null on line 55\n\nWhen I take a look at line 55 of mpc86xx.patch, I see this:\n\n  # Yes MCA RS/6000s exist but Linux-PPC does not currently support any\n  config MCA\ndiff --git a/arch/powerpc/boot/dts/mpc86xx.dts b/arch/powerpc/boot/dts/mpc86xx.dts$\nnew file mode 100644\nindex 0000000..a8a13b4\n--- /dev/null\t\t\t\t\t<--- line 55\n+++ b/arch/powerpc/boot/dts/mpc86xx.dts\n@@ -0,0 +1,187 @@\n+/*\n+ * MPC86xx Device Tree Source\n+ *\n+ * Copyright 2007 Freescale Semiconductor Inc.\n\nSo obviously, I was confused.  Well, I figured out the problem.  The patch did not include \na changelog.  All it had was this:\n\n From b878a6b32a733e72a771fffd632f57b08808fc7f Mon Sep 17 00:00:00 2001\nFrom: xxx <xxx@freescale.com>\nDate: Tue, 19 Jun 2007 12:55:59 -0500\nSubject: [PATCH] Added MPC86xx Support\n\nSigned-off-by: xxx <xxx@freescale.com>\n---\n  arch/powerpc/Kconfig                        |    3 +-\n\n\nCould someone please update the git-am and git-apply code to provide a better error \nmessage in this situation?  Thanks.\n\n-- \nTimur Tabi\nLinux Kernel Developer @ Freescale\n"}]}