git-filter-repo.txt: minor updates to docs

A few changes:
  * Include notes about git-2.24.0 changes
  * Make it clearer that messing with the first parent could have
    negative side-effects if the file_changes aren't also updated.
  * Fix wrapping of a line that was too long.

Also, update the README.md:
  * Note the upstream improvements made in (not yet released) git-2.24.0

Signed-off-by: Elijah Newren <newren@gmail.com>
pull/13/head
Elijah Newren 5 years ago
parent 320c85f941
commit e0140bb2ad

@ -1002,9 +1002,11 @@ heavy lifting, it inherits limitations from those systems:
* commits get rewritten meaning they will have new hashes; therefore,
signatures on commits and tags cannot continue to work and instead are
just removed (thus signed tags become annotated tags)
* tags of commits are supported; tags of anything else (blobs, trees, or
tags) are not. (fast-export aborts on tags of blobs and tags of tags,
and simply ignores tags of trees with a warning.)
* tags of commits are supported. Prior to git-2.24.0, tags of blobs and
tags of tags are not supported (fast-export would die on such tags).
tags of trees are not supported in any git version (since fast-export
ignores tags of trees with a warning and fast-import provides no way to
import them).
* annotated and signed tags outside of the refs/tags/ namespace are not
supported (their location will be mangled in weird ways)
* fast-import will die on various forms of invalid input, such as a
@ -1015,9 +1017,9 @@ heavy lifting, it inherits limitations from those systems:
* commits without an author will be given one matching the committer
* tags without a tagger will be given a fake tagger
* references that include commit cycles in their history (which can be
created with linkgit:git-replace[1]) will not be flagged to the user as an
error but will be silently deleted by fast-export as though the branch
or tag contained no interesting files
created with linkgit:git-replace[1]) will not be flagged to the user as
an error but will be silently deleted by fast-export as though the
branch or tag contained no interesting files
There are also some limitations due to the design of these systems:
@ -1025,7 +1027,10 @@ There are also some limitations due to the design of these systems:
fast-export only lists file changes in a merge relative to its first
parent, if you insert additional files into a commit that is in the
second (or third or fourth) parent history of a merge, then you also
need to add it to the merge manually.
need to add it to the merge manually. (Similarly, if you change which
parent is the first parent in a merge commit, you need to manually
update the list of file changes to be relative to the new first
parent.)
* fast-export and fast-import work with exact file contents, not patches.
(e.g. "Whatever the current contents of this file, update them to now

@ -318,6 +318,25 @@ Work on filter-repo and its predecessor has also driven numerous
improvements to fast-export and fast-import (and occasionally other
commands) in core git:
* git-2.24.0
* [fast-export: handle nested tags](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=941790d7de)
* [t9350: add tests for tags of things other than a commit](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=8d7d33c1ce)
* [fast-export: allow user to request tags be marked with --mark-tags](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=a1638cfe12)
* [fast-export: add support for --import-marks-if-exists](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=208d69246e)
* [fast-import: add support for new 'alias' command](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=b8f50e5b60)
* [fast-import: allow tags to be identified by mark labels](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=f73b2aba05)
* [fast-import: fix handling of deleted tags](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=3164e6bd24)
* [fast-export: fix exporting a tag and nothing else](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=af2abd870b)
* [git-fast-import.txt: clarify that multiple merge commits are allowed](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=d1387d3895)
* git-2.23.0
* [t9350: fix encoding test to actually test reencoding](
https://git.kernel.org/pub/scm/git/git.git/commit/?id=32615ce762)

Loading…
Cancel
Save