From: Felipe Contreras <felipe.contreras@gmail.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fast-export: Allow pruned-references in mark file
Date: Sat, 6 Apr 2013 11:33:23 -0600 [thread overview]
Message-ID: <CAMP44s1n0ALFeOvYevT919iCUt_qRP-nUZn9VqNNnqLG-Xaa1Q@mail.gmail.com> (raw)
In-Reply-To: <1365267871-2904-1-git-send-email-apelisse@gmail.com>
On Sat, Apr 6, 2013 at 11:04 AM, Antoine Pelisse <apelisse@gmail.com> wrote:
> fast-export can fail because of some pruned-reference when importing a
> mark file.
>
> The problem happens in the following scenario:
>
> $ git fast-export --export-marks=MARKS master
> (rewrite master)
> $ git prune
> $ git fast-export --import-marks=MARKS master
>
> This might fail if some references have been removed by prune
> because some marks will refer to no longer existing commits.
> git-fast-export will not need these objects anyway as they were no
> longer reachable.
>
> We still need to update last_numid so we don't change the mapping
> between marks and objects for remote-helpers.
> Unfortunately, the mark file should not be rewritten without lost marks
> if no new objects has been exported, as we could lose track of the last
> last_numid.
Makes sense to me.
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
--
Felipe Contreras
prev parent reply other threads:[~2013-04-06 17:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-24 9:47 [PATCH] fast-export: Allow pruned-references in mark file Antoine Pelisse
2012-11-26 4:03 ` Junio C Hamano
2012-11-26 11:37 ` Felipe Contreras
2012-11-26 13:23 ` Antoine Pelisse
2012-11-26 14:04 ` Felipe Contreras
2012-11-26 14:14 ` Antoine Pelisse
2012-11-26 17:41 ` Junio C Hamano
2012-11-26 20:04 ` Antoine Pelisse
2012-11-26 20:39 ` Felipe Contreras
2012-11-26 20:44 ` Junio C Hamano
2012-12-01 10:10 ` Antoine Pelisse
2013-04-06 17:04 ` Antoine Pelisse
2013-04-06 17:33 ` Felipe Contreras [this message]
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=CAMP44s1n0ALFeOvYevT919iCUt_qRP-nUZn9VqNNnqLG-Xaa1Q@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=apelisse@gmail.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 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).