diff options
| author | Elijah Newren <newren@gmail.com> | 2019-10-03 20:27:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-03 22:33:21 (GMT) |
| commit | f73b2aba05788208ccd9b48f350b90cbfe57e1c4 (patch) | |
| tree | a82fc54fb135a3945bc1e3ad347ea14644bec822 /Documentation | |
| parent | 3164e6bd24ead3598dcf9374077f87167b796c93 (diff) | |
| download | git-f73b2aba05788208ccd9b48f350b90cbfe57e1c4.zip git-f73b2aba05788208ccd9b48f350b90cbfe57e1c4.tar.gz git-f73b2aba05788208ccd9b48f350b90cbfe57e1c4.tar.bz2 | |
fast-import: allow tags to be identified by mark labels
Mark identifiers are used in fast-export and fast-import to provide a
label to refer to earlier content. Blobs are given labels because they
need to be referenced in the commits where they first appear with a
given filename, and commits are given labels because they can be the
parents of other commits. Tags were never given labels, probably
because they were viewed as unnecessary, but that presents two problems:
1. It leaves us without a way of referring to previous tags if we
want to create a tag of a tag (or higher nestings).
2. It leaves us with no way of recording that a tag has already been
imported when using --export-marks and --import-marks.
Fix these problems by allowing an optional mark label for tags.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 0bb2762..4977869 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -774,6 +774,7 @@ lightweight (non-annotated) tags see the `reset` command below. .... 'tag' SP <name> LF + mark? 'from' SP <commit-ish> LF original-oid? 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF |