From: Jonathan Nieder <jrnieder@gmail.com>
To: Vitor Antunes <vitor.hda@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git fast-import : How to change parent during import?
Date: Mon, 7 Mar 2011 20:44:27 -0600 [thread overview]
Message-ID: <20110308024427.GA21471@elie> (raw)
In-Reply-To: <AANLkTikiEfUSdNqqTjuYy_JLJnEyCizmusSucYsEHC2r@mail.gmail.com>
Hi,
Vitor Antunes wrote:
> Is it possible to change the parent of a commit during fast import?
> I've tried using "reset" command and making a new commit pointing to a
> new parent, but in both cases I get a "new tip ... does not contain
> ..." error message.
Have you tried "git fast-import --force"?
> Providing a bit of context. I'm trying to improve git-p4 to detect the
> parent commit of a new branch.
[...]
> To achieve this I used the checkpoint command to flush the list of
> imported commits to disk and then used standard rev-list and diff-tree
> commands to make find the parent commit. I am now at a point where I
> am able to correctly identify the parent commit, but when trying to
> update the from information I get the above message.
The advice in the section "Use Tag Fixup Branches" of git-fast-import(1)
might be useful.
Thanks for an interesting example, and hope that helps.
Jonathan
next prev parent reply other threads:[~2011-03-08 2:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-08 1:21 git fast-import : How to change parent during import? Vitor Antunes
2011-03-08 2:44 ` Jonathan Nieder [this message]
2011-03-08 21:19 ` Vitor Antunes
2011-03-08 22:23 ` Jonathan Nieder
2011-03-09 14:21 ` Vitor Antunes
2011-03-30 17:25 ` Vitor Antunes
2011-08-28 15:23 ` Vitor Antunes
2011-08-28 23:39 ` Jonathan Nieder
2011-08-29 1:13 ` Sverre Rabbelier
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=20110308024427.GA21471@elie \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=vitor.hda@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).