git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Dirk Süsserott" <newsletter@dirk.my1.cc>
To: Git Mailing List <git@vger.kernel.org>
Subject: git-am with an initial checkin doesn't work
Date: Tue, 14 Jul 2009 16:55:34 +0200	[thread overview]
Message-ID: <4A5C9C66.1050100@dirk.my1.cc> (raw)

Hi,

I've a question concerning 'git am' and 'git format-patch'. It seems
impossible to apply the "initial checkin" (as generated by git
format-patch -N --root) to an empty repository. The following workflow
might clarify that:

# Create a new repository with an initial checkin:
mkdir foo && cd foo && git init
echo "initial checkin" > initial.checkin
git add initial.checkin && git commit -m "initial checkin"

# Kinda "export" the repo:
git format-patch -1 --root; # generates 0001-initial-checkin.patch

# Re-create the repository:
rm -rf .git initial.checkin && git init

# Try to "import" the patch:
git am 0001-initial-checkin.patch

The latter yields to
fatal: HEAD: not a valid SHA1
fatal: bad revision 'HEAD'

It works, when I
git apply 0001-initial-checkin.patch
instead of am'ing it, but then the thing isn't committed and I've to
manually git-commit it.

Is this a bug, intentional behavior, or am I missing some magic option
to git-am?

Background:
I faced that problem when I tried to import some old data into Git
(namely .tar.gz files) and wanted to start with 2 or 3 commits of my own
(the import scripts) and then the other files on top of it. Because my
import scripts didn't work well at first, I had to re-, re-, and
re-import and start over all again. To always start with a clean repo, I
thought adding my scripts and then saving them as 000N-*.patch would be
a good idea, but the initial git-am didn't work. I know, there are other
ways (git-rebase is a big friend here), but I thought git-format-patch
and git-am worked symmetrically. Wrong?

Cheers,
    Dirk

             reply	other threads:[~2009-07-14 14:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-14 14:55 Dirk Süsserott [this message]
2009-07-14 18:24 ` git-am with an initial checkin doesn't work Junio C Hamano
2009-07-15 14:46   ` Dirk Süsserott

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=4A5C9C66.1050100@dirk.my1.cc \
    --to=newsletter@dirk.my1.cc \
    --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 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).