@matheusbsbs / matheus-bagliano / commits / ee4bc3715f
Fork 0

fast-export: rename the signed tag mode 'ignore' to 'verbatim'

The name 'verbatim' describes much better what this mode does with signed tags. While at it, fix the documentation what it actually does. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Dec 3, 2007 at 22:44 UTC ee4bc3715fd8e4598d31dfa7288609cad86a2321
3 files changed +8 -8
Documentation/git-fast-export.txt
+2 -2
@@ -26,14 +26,14 @@ OPTIONS
26 Insert 'progress' statements every <n> objects, to be shown by
27 gitlink:git-fast-import[1] during import.
28
29 ---signed-tags=(ignore|warn|strip|abort)::
29 +--signed-tags=(verbatim|warn|strip|abort)::
30 Specify how to handle signed tags. Since any transformation
31 after the export can change the tag names (which can also happen
32 when excluding revisions) the signatures will not match.
33 +
34 When asking to 'abort' (which is the default), this program will die
35 when encountering a signed tag. With 'strip', the tags will be made
36 -unsigned, with 'ignore', they will be silently ignored (i.e. not exported)
36 +unsigned, with 'verbatim', they will be silently exported
37 and with 'warn', they will be exported, but you will see a warning.
38
39
builtin-fast-export.c
+4 -4
@@ -23,15 +23,15 @@ static const char *fast_export_usage[] = {
23 };
24
25 static int progress;
26 -static enum { IGNORE, WARN, STRIP, ABORT } signed_tag_mode = ABORT;
26 +static enum { VERBATIM, WARN, STRIP, ABORT } signed_tag_mode = ABORT;
27
28 static int parse_opt_signed_tag_mode(const struct option *opt,
29 const char *arg, int unset)
30 {
31 if (unset || !strcmp(arg, "abort"))
32 signed_tag_mode = ABORT;
33 - else if (!strcmp(arg, "ignore"))
34 - signed_tag_mode = IGNORE;
33 + else if (!strcmp(arg, "verbatim") || !strcmp(arg, "ignore"))
34 + signed_tag_mode = VERBATIM;
35 else if (!strcmp(arg, "warn"))
36 signed_tag_mode = WARN;
37 else if (!strcmp(arg, "strip"))
@@ -270,7 +270,7 @@ static void handle_tag(const char *name, struct tag *tag)
270 warning ("Exporting signed tag %s",
271 sha1_to_hex(tag->object.sha1));
272 /* fallthru */
273 - case IGNORE:
273 + case VERBATIM:
274 break;
275 case STRIP:
276 message_size = signature + 1 - message;
t/t9301-fast-export.sh
+2 -2
@@ -106,9 +106,9 @@ test_expect_success 'signed-tags=abort' '
106
107 '
108
109 -test_expect_success 'signed-tags=ignore' '
109 +test_expect_success 'signed-tags=verbatim' '
110
111 - git fast-export --signed-tags=ignore sign-your-name > output &&
111 + git fast-export --signed-tags=verbatim sign-your-name > output &&
112 grep PGP output
113
114 '