diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-05-13 21:31:02 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-14 16:48:56 +0900 |
| commit | e80001f8fd7f608c6d05ce0ab2ebfc90d724a307 (patch) | |
| tree | 862a3cc24ecda7a58d66dd0ac76531780607d46e /Documentation | |
| parent | fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8 (diff) | |
| download | tgif-e80001f8fd7f608c6d05ce0ab2ebfc90d724a307.tar.xz | |
fast-export: do automatic reencoding of commit messages only if requested
Automatic re-encoding of commit messages (and dropping of the encoding
header) hurts attempts to do reversible history rewrites (e.g. sha1sum
<-> sha256sum transitions, some subtree rewrites), and seems
inconsistent with the general principle followed elsewhere in
fast-export of requiring explicit user requests to modify the output
(e.g. --signed-tags=strip, --tag-of-filtered-object=rewrite). Add a
--reencode flag that the user can use to specify, and like other
fast-export flags, default it to 'abort'.
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-export.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 64c01ba918..11427acdde 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -129,6 +129,13 @@ marks the same across runs. for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id). +--reencode=(yes|no|abort):: + Specify how to handle `encoding` header in commit objects. When + asking to 'abort' (which is the default), this program will die + when encountering such a commit object. With 'yes', the commit + message will be reencoded into UTF-8. With 'no', the original + encoding will be preserved. + --refspec:: Apply the specified refspec to each ref exported. Multiple of them can be specified. |