undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2007-12-03 22:44:39 +00:00 committed by Junio C Hamano
parent 14c9821884
commit ee4bc3715f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-fast-export.txt
View File

@ -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.

8
builtin-fast-export.c
View File

@ -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;

4
t/t9301-fast-export.sh
View File

@ -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
'