git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/8] fast export/import: handle nested tags, improve incremental exports

From
Elijah Newren <newren@gmail.com>
Date
Sep 30, 2019, 21:10 UTC
Message-ID
<20190930211018.23633-1-newren@gmail.com>
In-Reply-To
<20190925014005.17056-1-newren@gmail.com>

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.

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
Previous: Elijah NewrenNext: Elijah Newren
Message 10 of 33 in “fast export/import: handle nested tags, improve incremental exports”
  1. 0/8 fast export/import: handle nested tags, improve incremental exportsElijah Newren, Sep 25, 2019
  2. 1/8 fast-export: fix exporting a tag and nothing elseElijah Newren, Sep 25, 2019
  3. 2/8 fast-import: fix handling of deleted tagsElijah Newren, Sep 25, 2019
  4. 3/8 fast-import: allow tags to be identified by mark labelsElijah Newren, Sep 25, 2019
  5. 4/8 fast-import: add support for new 'alias' commandElijah Newren, Sep 25, 2019
  6. 6/8 fast-export: allow user to request tags be marked with --mark-tagsElijah Newren, Sep 25, 2019
  7. 5/8 fast-export: add support for --import-marks-if-existsElijah Newren, Sep 25, 2019
  8. 7/8 t9350: add tests for tags of things other than a commitElijah Newren, Sep 25, 2019
  9. 8/8 fast-export: handle nested tagsElijah Newren, Sep 25, 2019
  10. 0/8 fast export/import: handle nested tags, improve incremental exportsElijah Newren, Sep 30, 2019
  11. 1/8 fast-export: fix exporting a tag and nothing elseElijah Newren, Sep 30, 2019
  12. 2/8 fast-import: fix handling of deleted tagsElijah Newren, Sep 30, 2019
  13. René ScharfeOct 3, 2019
  14. 3/8 fast-import: allow tags to be identified by mark labelsElijah Newren, Sep 30, 2019
  15. 4/8 fast-import: add support for new 'alias' commandElijah Newren, Sep 30, 2019
  16. 5/8 fast-export: add support for --import-marks-if-existsElijah Newren, Sep 30, 2019
  17. 6/8 fast-export: allow user to request tags be marked with --mark-tagsElijah Newren, Sep 30, 2019
  18. 7/8 t9350: add tests for tags of things other than a commitElijah Newren, Sep 30, 2019
  19. 8/8 fast-export: handle nested tagsElijah Newren, Sep 30, 2019
  20. Elijah NewrenOct 2, 2019
  21. Junio C HamanoOct 2, 2019
  22. Elijah NewrenOct 2, 2019
  23. Junio C HamanoOct 3, 2019
  24. 0/8 fast export/import: handle nested tags, improve incremental exportsElijah Newren, Oct 3, 2019
  25. 1/8 fast-export: fix exporting a tag and nothing elseElijah Newren, Oct 3, 2019
  26. 2/8 fast-import: fix handling of deleted tagsElijah Newren, Oct 3, 2019
  27. 3/8 fast-import: allow tags to be identified by mark labelsElijah Newren, Oct 3, 2019
  28. 4/8 fast-import: add support for new 'alias' commandElijah Newren, Oct 3, 2019
  29. 5/8 fast-export: add support for --import-marks-if-existsElijah Newren, Oct 3, 2019
  30. 7/8 t9350: add tests for tags of things other than a commitElijah Newren, Oct 3, 2019
  31. 8/8 fast-export: handle nested tagsElijah Newren, Oct 3, 2019
  32. 6/8 fast-export: allow user to request tags be marked with --mark-tagsElijah Newren, Oct 3, 2019
  33. Junio C HamanoOct 4, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.