git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Michael Sims <michael.h.sims@gmail.com>,
	git@vger.kernel.org, Jens Lehmann <jens.lehmann@web.de>,
	Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: Re: "sha1 information is lacking or useless" when rebasing with a submodule pointer conflict
Date: Thu, 31 Jan 2013 20:01:21 -0800	[thread overview]
Message-ID: <7vboc4d6ni.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130130224904.GB1053@book.hvoigt.net> (Heiko Voigt's message of "Wed, 30 Jan 2013 23:49:04 +0100")

Heiko Voigt <hvoigt@hvoigt.net> writes:

> Maybe Martin or Junio immediately see whats going wrong here? I would
> need to further dig into the git-am code to find out how to fix it.

Thanks.  I think the minimum fix is this, but there are some nits to
pick around this area as well.


diff --git b/git-am.sh a/git-am.sh
index b4d95f5..202130f 100755
--- b/git-am.sh
+++ a/git-am.sh
@@ -664,7 +664,7 @@ do
 			sed -e '1,/^$/d' >"$dotest/msg-clean"
 			echo "$commit" >"$dotest/original-commit"
 			get_author_ident_from_commit "$commit" >"$dotest/author-script"
-			git diff-tree --root --binary "$commit" >"$dotest/patch"
+			git diff-tree --root --binary --full-index "$commit" >"$dotest/patch"
 		else
 			git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
 				<"$dotest/$msgnum" >"$dotest/info" ||

  parent reply	other threads:[~2013-02-01  4:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-30 18:43 "sha1 information is lacking or useless" when rebasing with a submodule pointer conflict Michael Sims
2013-01-30 21:56 ` Heiko Voigt
2013-01-30 22:49   ` Heiko Voigt
2013-01-30 23:39     ` Junio C Hamano
2013-02-01  4:01     ` Junio C Hamano [this message]
2013-02-01  4:32     ` [PATCH 0/3] rebasing changes that update submodules Junio C Hamano
2013-02-01  4:32       ` [PATCH 1/3] git-am: record full index line in the patch used while rebasing Junio C Hamano
2013-02-01  6:25         ` Martin von Zweigbergk
2013-02-01  4:32       ` [PATCH 2/3] apply: simplify build_fake_ancestor() Junio C Hamano
2013-02-01  4:32       ` [PATCH 3/3] apply: diagnose incomplete submodule object name better Junio C Hamano
2013-02-05 19:19         ` Re* " Junio C Hamano

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=7vboc4d6ni.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hvoigt@hvoigt.net \
    --cc=jens.lehmann@web.de \
    --cc=martin.von.zweigbergk@gmail.com \
    --cc=michael.h.sims@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).