diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:30:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:30:50 -0700 |
| commit | cd33b41c695be45974be38fb2f47768fc1b17190 (patch) | |
| tree | 8fe251d196337118b2108c7a43a03b6347c798e8 /Documentation | |
| parent | Sync with maint (diff) | |
| parent | transport-helper: add 'signed-tags' capability (diff) | |
| download | tgif-cd33b41c695be45974be38fb2f47768fc1b17190.tar.xz | |
Merge branch 'jk/remote-helper-with-signed-tags'
Allows remote-helpers to declare they can handle signed tags, and
issue a warning when using those that don't.
* jk/remote-helper-with-signed-tags:
transport-helper: add 'signed-tags' capability
transport-helper: pass --signed-tags=warn-strip to fast-export
fast-export: add --signed-tags=warn-strip mode
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-export.txt | 10 | ||||
| -rw-r--r-- | Documentation/gitremote-helpers.txt | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index feab7a3e4e..03fc8c39d8 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -27,15 +27,17 @@ OPTIONS Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import. ---signed-tags=(verbatim|warn|strip|abort):: +--signed-tags=(verbatim|warn|warn-strip|strip|abort):: Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match. + When asking to 'abort' (which is the default), this program will die -when encountering a signed tag. With 'strip', the tags will be made -unsigned, with 'verbatim', they will be silently exported -and with 'warn', they will be exported, but you will see a warning. +when encountering a signed tag. With 'strip', the tags will silently +be made unsigned, with 'warn-strip' they will be made unsigned but a +warning will be displayed, with 'verbatim', they will be silently +exported and with 'warn', they will be exported, but you will see a +warning. --tag-of-filtered-object=(abort|drop|rewrite):: Specify how to handle tags whose tagged object is filtered out. diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index f506031ae4..da746419b3 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -202,6 +202,10 @@ capability then it should advertise `refspec *:*`. marks specified in <file> before processing any input. For details, read up on '--import-marks=<file>' in linkgit:git-fast-export[1]. +'signed-tags':: + This modifies the 'export' capability, instructing Git to pass + '--signed-tags=verbatim' to linkgit:git-fast-export[1]. In the + absence of this capability, Git will use '--signed-tags=warn-strip'. |