From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2 0/8] fast export/import: handle nested tags, improve incremental exports
Date: Wed, 2 Oct 2019 08:54:02 -0700 [thread overview]
Message-ID: <CABPp-BFckDZL4iAqhHmrXDpFi3eQgvOkbgjJdGRZE4ePUwNDuw@mail.gmail.com> (raw)
In-Reply-To: <20190930211018.23633-1-newren@gmail.com>
Hi Junio,
On Mon, Sep 30, 2019 at 2:10 PM Elijah Newren <newren@gmail.com> wrote:
>
> This series improves the incremental export story for fast-export and
> fast-import (--export-marks and --import-marks fell a bit short),
> fixes a couple small export/import bugs, and enables handling nested
> tags. In particular, the nested tags handling makes it so that
> fast-export and fast-import can finally handle the git.git repo.
I see you picked up this corrected series in pu; thanks. However,
your merge commit, 2a99d6b6ff7c ("Merge branch
'en/fast-imexport-nested-tags' into pu", 2019-10-02), claims "Seems to
break t9300 when merged to 'pu'.". I know v1 did that and I could
reproduce, but I can't reproduce any failures here. Was this message
just left over or is there some problem you are seeing?
Thanks,
Elijah
>
> Changes since v1 (full range-diff below):
> - Fixed an issue integrating with next/pu (in particular, with
> jk/fast-import-history-bugfix)
>
> Elijah Newren (8):
> fast-export: fix exporting a tag and nothing else
> fast-import: fix handling of deleted tags
> fast-import: allow tags to be identified by mark labels
> fast-import: add support for new 'alias' command
> fast-export: add support for --import-marks-if-exists
> fast-export: allow user to request tags be marked with --mark-tags
> t9350: add tests for tags of things other than a commit
> fast-export: handle nested tags
>
> Documentation/git-fast-export.txt | 17 ++++--
> Documentation/git-fast-import.txt | 23 ++++++++
> builtin/fast-export.c | 67 ++++++++++++++++------
> fast-import.c | 94 +++++++++++++++++++++++++++----
> t/t9300-fast-import.sh | 37 ++++++++++++
> t/t9350-fast-export.sh | 68 ++++++++++++++++++++--
> 6 files changed, 268 insertions(+), 38 deletions(-)
>
> Range-diff:
> 1: b751d6c2d6 ! 1: 1d19498bc6 fast-import: fix handling of deleted tags
> @@ fast-import.c: static void parse_reset_branch(const char *arg)
> b = new_branch(arg);
> read_next_command();
> parse_from(b);
> -+ if (b->delete && !strncmp(arg, "refs/tags/", 10)) {
> ++ if (b->delete && !strncmp(b->name, "refs/tags/", 10)) {
> + /*
> + * Elsewhere, we call dump_branches() before dump_tags(),
> + * and dump_branches() will handle ref deletions first, so
> @@ fast-import.c: static void parse_reset_branch(const char *arg)
> + for (t = first_tag; t; t = t->next_tag) {
> + strbuf_reset(&tag_name);
> + strbuf_addf(&tag_name, "refs/tags/%s", t->name);
> -+ if (!strcmp(arg, tag_name.buf))
> ++ if (!strcmp(b->name, tag_name.buf))
> + break;
> + prev = t;
> + }
> 2: 26b77dde15 = 2: e1fd888e4a fast-import: allow tags to be identified by mark labels
> 3: e0d1a1d7aa = 3: 93175f28d9 fast-import: add support for new 'alias' command
> 4: edea892661 = 4: 8c8743395c fast-export: add support for --import-marks-if-exists
> 5: 6af7e1fdd0 = 5: eebc40df33 fast-export: allow user to request tags be marked with --mark-tags
> 6: 631ae9a63e = 6: de39f703c6 t9350: add tests for tags of things other than a commit
> 7: c0e932e4da = 7: ac739dbb79 fast-export: handle nested tags
> --
> 2.23.0.264.gac739dbb79
>
next prev parent reply other threads:[~2019-10-02 15:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 1:39 [PATCH 0/8] fast export/import: handle nested tags, improve incremental exports Elijah Newren
2019-09-25 1:39 ` [PATCH 1/8] fast-export: fix exporting a tag and nothing else Elijah Newren
2019-09-25 1:39 ` [PATCH 2/8] fast-import: fix handling of deleted tags Elijah Newren
2019-09-25 1:40 ` [PATCH 3/8] fast-import: allow tags to be identified by mark labels Elijah Newren
2019-09-25 1:40 ` [PATCH 4/8] fast-import: add support for new 'alias' command Elijah Newren
2019-09-25 1:40 ` [PATCH 5/8] fast-export: add support for --import-marks-if-exists Elijah Newren
2019-09-25 1:40 ` [PATCH 6/8] fast-export: allow user to request tags be marked with --mark-tags Elijah Newren
2019-09-25 1:40 ` [PATCH 7/8] t9350: add tests for tags of things other than a commit Elijah Newren
2019-09-25 1:40 ` [PATCH 8/8] fast-export: handle nested tags Elijah Newren
2019-09-30 21:10 ` [PATCH v2 0/8] fast export/import: handle nested tags, improve incremental exports Elijah Newren
2019-09-30 21:10 ` [PATCH v2 1/8] fast-export: fix exporting a tag and nothing else Elijah Newren
2019-09-30 21:10 ` [PATCH v2 2/8] fast-import: fix handling of deleted tags Elijah Newren
2019-10-03 11:53 ` René Scharfe
2019-09-30 21:10 ` [PATCH v2 3/8] fast-import: allow tags to be identified by mark labels Elijah Newren
2019-09-30 21:10 ` [PATCH v2 4/8] fast-import: add support for new 'alias' command Elijah Newren
2019-09-30 21:10 ` [PATCH v2 5/8] fast-export: add support for --import-marks-if-exists Elijah Newren
2019-09-30 21:10 ` [PATCH v2 6/8] fast-export: allow user to request tags be marked with --mark-tags Elijah Newren
2019-09-30 21:10 ` [PATCH v2 7/8] t9350: add tests for tags of things other than a commit Elijah Newren
2019-09-30 21:10 ` [PATCH v2 8/8] fast-export: handle nested tags Elijah Newren
2019-10-02 15:54 ` Elijah Newren [this message]
2019-10-02 20:10 ` [PATCH v2 0/8] fast export/import: handle nested tags, improve incremental exports Junio C Hamano
2019-10-02 21:05 ` Elijah Newren
2019-10-03 1:07 ` Junio C Hamano
2019-10-03 20:27 ` [PATCH -v3 " Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 1/8] fast-export: fix exporting a tag and nothing else Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 2/8] fast-import: fix handling of deleted tags Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 3/8] fast-import: allow tags to be identified by mark labels Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 4/8] fast-import: add support for new 'alias' command Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 5/8] fast-export: add support for --import-marks-if-exists Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 6/8] fast-export: allow user to request tags be marked with --mark-tags Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 7/8] t9350: add tests for tags of things other than a commit Elijah Newren
2019-10-03 20:27 ` [PATCH -v3 8/8] fast-export: handle nested tags Elijah Newren
2019-10-04 5:51 ` [PATCH -v3 0/8] fast export/import: handle nested tags, improve incremental exports 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
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=CABPp-BFckDZL4iAqhHmrXDpFi3eQgvOkbgjJdGRZE4ePUwNDuw@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).