From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] fast-export: rename the signed tag mode 'ignore' to 'verbatim'
Date: Mon, 3 Dec 2007 22:44:39 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0712032243450.27959@racer.site> (raw)
In-Reply-To: <7vwsrvh4vx.fsf@gitster.siamese.dyndns.org>
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>
---
On Mon, 3 Dec 2007, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > But the original author already admitted that the original
> > naming was stupid...
>
> Ok, send in updates, please.
Alright...
Documentation/git-fast-export.txt | 4 ++--
builtin-fast-export.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 073ff7f..fd3d571 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 72be45d..2136aad 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;
--
1.5.3.7.2120.g1a32
next prev parent reply other threads:[~2007-12-03 22:45 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-02 22:04 v1.5.4 plans Junio C Hamano
2007-12-02 22:33 ` Jakub Narebski
2007-12-02 22:41 ` Junio C Hamano
2007-12-02 23:39 ` David Symonds
2007-12-03 2:32 ` Junio C Hamano
2007-12-03 10:00 ` Many things pushed out to 'master' Junio C Hamano
2007-12-03 11:12 ` Johannes Schindelin
2007-12-03 18:19 ` Junio C Hamano
2007-12-03 18:39 ` Johannes Schindelin
2007-12-03 20:58 ` Junio C Hamano
2007-12-03 22:44 ` Johannes Schindelin [this message]
2007-12-03 22:56 ` [PATCH] fast-export: rename the signed tag mode 'ignore' to 'verbatim' Johannes Schindelin
2007-12-03 9:06 ` [PATCH] Fix quote_path when called with negative length Pierre Habouzit
2007-12-03 17:18 ` Jeff King
2007-12-03 18:06 ` v1.5.4 plans Nicolas Pitre
2007-12-03 21:23 ` Junio C Hamano
2007-12-14 3:32 ` [PATCH] provide advance warning of some future pack default changes Nicolas Pitre
2007-12-14 5:19 ` Junio C Hamano
2007-12-14 13:14 ` Nicolas Pitre
2007-12-14 12:45 ` Jakub Narebski
2007-12-14 13:38 ` Nicolas Pitre
2007-12-14 21:52 ` Joel Becker
2007-12-14 22:34 ` Nicolas Pitre
2007-12-14 22:39 ` Joel Becker
2007-12-14 22:46 ` Nicolas Pitre
2007-12-15 0:42 ` Joel Becker
2007-12-15 1:08 ` Nicolas Pitre
2007-12-15 1:21 ` Johannes Schindelin
2007-12-15 1:43 ` Junio C Hamano
2007-12-15 2:23 ` Nicolas Pitre
2007-12-17 20:09 ` Joel Becker
2007-12-17 20:41 ` Nicolas Pitre
2007-12-17 21:13 ` Joel Becker
2007-12-17 21:30 ` J. Bruce Fields
2007-12-17 21:52 ` Nicolas Pitre
2007-12-17 21:57 ` J. Bruce Fields
2007-12-17 22:15 ` Nicolas Pitre
2007-12-17 22:17 ` Junio C Hamano
2007-12-17 22:30 ` J. Bruce Fields
2007-12-17 22:55 ` Junio C Hamano
2007-12-18 0:04 ` J. Bruce Fields
2007-12-17 23:13 ` Nicolas Pitre
2007-12-17 21:16 ` Junio C Hamano
2007-12-17 21:45 ` Nicolas Pitre
2007-12-18 0:41 ` Junio C Hamano
2007-12-18 2:23 ` Mark Fasheh
2007-12-18 3:23 ` Nicolas Pitre
2007-12-18 3:52 ` Martin Langhoff
2007-12-18 4:09 ` Nicolas Pitre
2007-12-18 5:01 ` Junio C Hamano
2007-12-18 9:24 ` Jakub Narebski
2007-12-18 12:03 ` Johannes Schindelin
2007-12-18 14:16 ` Nicolas Pitre
2007-12-18 11:11 ` Jeff King
2007-12-18 12:06 ` Johannes Schindelin
2007-12-18 12:48 ` Jeff King
2007-12-18 13:30 ` Johannes Schindelin
2007-12-18 19:30 ` Jeff King
2007-12-18 20:12 ` Nicolas Pitre
2007-12-18 13:47 ` Jakub Narebski
2007-12-18 20:24 ` Junio C Hamano
2007-12-18 2:15 ` Mark Fasheh
2007-12-18 3:34 ` Nicolas Pitre
2007-12-04 0:48 ` v1.5.4 plans Russell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0712032243450.27959@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).