All of lore.kernel.org
 help / color / mirror / Atom feed
From: Timur Tabi <timur@freescale.com>
To: git@vger.kernel.org
Subject: git-apply and git-am should provide better errors when changelog is missing
Date: Mon, 23 Jul 2007 12:15:13 -0500	[thread overview]
Message-ID: <46A4E221.9050302@freescale.com> (raw)

I was trying to apply a patch, and I kept getting this odd error:

I'm trying to apply a patch, and I get this error message:

git-apply --stat mpc86xx.patch
fatal: git-apply: bad git-diff - expected /dev/null on line 55

When I take a look at line 55 of mpc86xx.patch, I see this:

  # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
  config MCA
diff --git a/arch/powerpc/boot/dts/mpc86xx.dts b/arch/powerpc/boot/dts/mpc86xx.dts$
new file mode 100644
index 0000000..a8a13b4
--- /dev/null					<--- line 55
+++ b/arch/powerpc/boot/dts/mpc86xx.dts
@@ -0,0 +1,187 @@
+/*
+ * MPC86xx Device Tree Source
+ *
+ * Copyright 2007 Freescale Semiconductor Inc.

So obviously, I was confused.  Well, I figured out the problem.  The patch did not include 
a changelog.  All it had was this:

 From b878a6b32a733e72a771fffd632f57b08808fc7f Mon Sep 17 00:00:00 2001
From: xxx <xxx@freescale.com>
Date: Tue, 19 Jun 2007 12:55:59 -0500
Subject: [PATCH] Added MPC86xx Support

Signed-off-by: xxx <xxx@freescale.com>
---
  arch/powerpc/Kconfig                        |    3 +-


Could someone please update the git-am and git-apply code to provide a better error 
message in this situation?  Thanks.

-- 
Timur Tabi
Linux Kernel Developer @ Freescale

                 reply	other threads:[~2007-07-23 17:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=46A4E221.9050302@freescale.com \
    --to=timur@freescale.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.