fast export/import: handle nested tags, improve incremental exports
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest8 patches 5 repliesIn review
- v18 patches 0 repliesSuperseded
Changes in v2 from the cover letter
- Fixed an issue integrating with next/pu (in particular, with jk/fast-import-history-bugfix)
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | fast-export: fix exporting a tag and nothing elsebuiltin/ t/ | +19 | 0 replies | |
| 2/8 | fast-import: fix handling of deleted tagsfast-import.c t/ | +42 | 1 reply | |
| 3/8 | fast-import: allow tags to be identified by mark labelsDocumentation/ fast-import.c t/ | +22 | 0 replies | |
| 4/8 | fast-import: add support for new 'alias' commandDocumentation/ fast-import.c t/ | +79 | 0 replies | |
| 5/8 | fast-export: add support for --import-marks-if-existsbuiltin/ t/ | +23 | 0 replies | |
| 6/8 | fast-export: allow user to request tags be marked with --mark-tagsDocumentation/ builtin/ t/ | +34 | 0 replies | |
| 7/8 | t9350: add tests for tags of things other than a committ/ | +31 | 0 replies | |
| 8/8 | fast-export: handle nested tagsbuiltin/ t/ | +19 | 0 replies |
Reviews trailers per patch
None of the 8 patches has a Reviewed-by or Acked-by.
| Patch | René Scharfe |
|---|---|
| Series | Helped-by |
| 1/8 | |
| 2/8 | |
| 3/8 | |
| 4/8 | |
| 5/8 | |
| 6/8 | |
| 7/8 | |
| 8/8 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/8] fast export/import: handle nested tags, improve incremental exports
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 tagsSignature · 1 line
2.23.0.264.gac739dbb79