diff options
| -rw-r--r-- | Documentation/git-fast-export.txt | 4 | ||||
| -rwxr-xr-x | builtin-fast-export.c | 8 | ||||
| -rwxr-xr-x | t/t9301-fast-export.sh | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 073ff7f123..fd3d571464 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -26,14 +26,14 @@ OPTIONS Insert 'progress' statements every <n> objects, to be shown by gitlink:git-fast-import[1] during import. ---signed-tags=(ignore|warn|strip|abort):: +--signed-tags=(verbatim|warn|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 'ignore', they will be silently ignored (i.e. not exported) +unsigned, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning. diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 72be45db46..2136aadfd7 100755 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -23,15 +23,15 @@ static const char *fast_export_usage[] = { }; static int progress; -static enum { IGNORE, WARN, STRIP, ABORT } signed_tag_mode = ABORT; +static enum { VERBATIM, WARN, STRIP, ABORT } signed_tag_mode = ABORT; static int parse_opt_signed_tag_mode(const struct option *opt, const char *arg, int unset) { if (unset || !strcmp(arg, "abort")) signed_tag_mode = ABORT; - else if (!strcmp(arg, "ignore")) - signed_tag_mode = IGNORE; + else if (!strcmp(arg, "verbatim") || !strcmp(arg, "ignore")) + signed_tag_mode = VERBATIM; else if (!strcmp(arg, "warn")) signed_tag_mode = WARN; else if (!strcmp(arg, "strip")) @@ -270,7 +270,7 @@ static void handle_tag(const char *name, struct tag *tag) warning ("Exporting signed tag %s", sha1_to_hex(tag->object.sha1)); /* fallthru */ - case IGNORE: + case VERBATIM: break; case STRIP: message_size = signature + 1 - message; diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index e9c9fe65d0..f09bfb1117 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -106,9 +106,9 @@ test_expect_success 'signed-tags=abort' ' ' -test_expect_success 'signed-tags=ignore' ' +test_expect_success 'signed-tags=verbatim' ' - git fast-export --signed-tags=ignore sign-your-name > output && + git fast-export --signed-tags=verbatim sign-your-name > output && grep PGP output ' |