From: Sverre Rabbelier <srabbelier@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: ">" <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 4/4] fast-export: make sure refs are updated properly
Date: Tue, 30 Oct 2012 14:59:57 -0700 [thread overview]
Message-ID: <CAGdFq_h3L-1rPvb=dSYeXqEea+f+g2kRHp7aAjaU-AxjZHB7dQ@mail.gmail.com> (raw)
In-Reply-To: <CAMP44s2QwdZKqJq0BZ5HOtZYiCMxCxycui9EmxxfL+Sa6M_6+g@mail.gmail.com>
On Tue, Oct 30, 2012 at 2:35 PM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> On Tue, Oct 30, 2012 at 10:17 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
>> On Tue, Oct 30, 2012 at 11:47 AM, Felipe Contreras
>> <felipe.contreras@gmail.com> wrote:
>>> Why would it? We are not changing the way objects are exported, the
>>> only difference is what happens at the end
>>> (handle_tags_and_duplicates()).
>>
>> Because the marking is per-commit, not per-ref, right?
>
> Oh, you meant using marks?
No, I meant the 'SHOWN' flag, doesn't it get added per commit, not per
ref? That is, commit->object.flags & SHOWN refers to the object
underlying the ref. So I suspect this scenario doesn't pass the tests:
git init &&
echo first > content &&
git add content &&
git commit -m "first" &&
git branch first &&
echo two > content &&
git commit -m "second" &&
git branch second &&
git fast-export first > actual &&
test_cmp actual expected_first &&
git fast-export second > actual &&
test_cmp actual expected_second
With expected_first being something like:
<fast-export stream with the first commit>
<reset command to set first to the right commit>
And expected_second being something like
<fast export stream with the first and second command>
<reset command to set first and second to their respective branches>
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2012-10-30 22:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1351617089-13036-1-git-send-email-felipe.contreras@gmail.com>
[not found] ` <1351617089-13036-5-git-send-email-felipe.contreras@gmail.com>
2012-10-30 18:12 ` [PATCH v2 4/4] fast-export: make sure refs are updated properly Sverre Rabbelier
2012-10-30 18:47 ` Felipe Contreras
2012-10-30 21:17 ` Sverre Rabbelier
2012-10-30 21:35 ` Felipe Contreras
2012-10-30 21:38 ` Jonathan Nieder
2012-10-30 21:41 ` Felipe Contreras
2012-10-30 21:59 ` Sverre Rabbelier [this message]
2012-10-30 22:18 ` Felipe Contreras
2012-10-30 22:35 ` Sverre Rabbelier
2012-10-30 22:56 ` Felipe Contreras
[not found] ` <1351617089-13036-2-git-send-email-felipe.contreras@gmail.com>
2012-10-30 18:55 ` [PATCH v2 1/4] fast-export: trivial cleanup Jonathan Nieder
[not found] ` <1351617089-13036-3-git-send-email-felipe.contreras@gmail.com>
2012-10-30 18:57 ` [PATCH v2 2/4] fast-export: fix comparisson in tests Jonathan Nieder
[not found] ` <1351617089-13036-4-git-send-email-felipe.contreras@gmail.com>
2012-10-30 18:59 ` [PATCH v2 3/4] fast-export: don't handle uninteresting refs Jonathan Nieder
2012-10-30 19:17 ` Felipe Contreras
2012-10-30 21:40 ` Felipe Contreras
2012-10-30 21:45 ` Jonathan Nieder
2012-10-30 22:01 ` Felipe Contreras
2012-10-30 22:07 ` Jonathan Nieder
2012-10-30 22:22 ` Felipe Contreras
2012-10-30 23:55 ` Jonathan Nieder
2012-10-31 1:03 ` Felipe Contreras
2012-10-31 1:08 ` Jonathan Nieder
2012-10-31 1:39 ` Felipe Contreras
2012-10-31 1:51 ` Jonathan Nieder
2012-10-31 2:22 ` Felipe Contreras
2012-10-31 0:57 ` Jonathan Nieder
2012-10-31 1:23 ` Felipe Contreras
2012-10-31 1:35 ` Jonathan Nieder
[not found] ` <20121030184755.GC15167@elie.Belkin>
[not found] ` <CAMP44s2F3qJeGL4V5KZjFNqKA5hrFQKRxXMrakFA6pTNi1DZ3w@mail.gmail.com>
[not found] ` <20121030190126.GJ15167@elie.Belkin>
[not found] ` <CAMP44s1W4mwK+cNwBqu2S0=Aw04XX9KBan8w4ghyzqbODdmiLQ@mail.gmail.com>
2012-10-30 19:41 ` Johannes Schindelin
2012-10-30 19:06 [PATCH v3 0/4] fast-export: general fixes Felipe Contreras
2012-10-30 19:06 ` [PATCH v3 4/4] fast-export: make sure refs are updated properly Felipe Contreras
2012-10-31 0:11 ` [PATCH v2 " Jonathan Nieder
2012-10-31 2:08 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGdFq_h3L-1rPvb=dSYeXqEea+f+g2kRHp7aAjaU-AxjZHB7dQ@mail.gmail.com' \
--to=srabbelier@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).