admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg-interface: refactor 'enum sign_mode' parsing

Browse Source 
The definition of 'enum sign_mode' as well as its parsing code are in
"builtin/fast-export.c". This was fine because `git fast-export` was the
only command with '--signed-tags=<mode>' or '--signed-commits=<mode>'
options.

In a following commit, we are going to add a similar option to `git
fast-import`, which will be simpler, easier and cleaner if we can reuse
the 'enum sign_mode' defintion and parsing code.

So let's move that definition and parsing code from
"builtin/fast-export.c" to "gpg-interface.{c,h}".

While at it, let's fix a small indentation issue with the arguments of
parse_opt_sign_mode().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2025-09-17 20:14:26 +02:00
committed by Junio C Hamano
parent 4975ec3473
commit 2f8fd208c3
3 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/fast-export.c
View File

@@ -37,8 +37,6 @@ static const char *const fast_export_usage[] = {
NULL NULL
}; };
enum sign_mode { SIGN_ABORT, SIGN_VERBATIM, SIGN_STRIP, SIGN_WARN_VERBATIM, SIGN_WARN_STRIP };
static int progress; static int progress;
static enum sign_mode signed_tag_mode = SIGN_ABORT; static enum sign_mode signed_tag_mode = SIGN_ABORT;
static enum sign_mode signed_commit_mode = SIGN_STRIP; static enum sign_mode signed_commit_mode = SIGN_STRIP;
@@ -62,20 +60,13 @@ static int parse_opt_sign_mode(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
enum sign_mode *val = opt->value; enum sign_mode *val = opt->value;
if (unset) if (unset)
return 0; return 0;
else if (!strcmp(arg, "abort"))
*val = SIGN_ABORT; if (parse_sign_mode(arg, val))
else if (!strcmp(arg, "verbatim") || !strcmp(arg, "ignore"))
*val = SIGN_VERBATIM;
else if (!strcmp(arg, "warn-verbatim") || !strcmp(arg, "warn"))
*val = SIGN_WARN_VERBATIM;
else if (!strcmp(arg, "warn-strip"))
*val = SIGN_WARN_STRIP;
else if (!strcmp(arg, "strip"))
*val = SIGN_STRIP;
else
return error("Unknown %s mode: %s", opt->long_name, arg); return error("Unknown %s mode: %s", opt->long_name, arg);
return 0; return 0;
} }

17
gpg-interface.c
View File

@@ -1125,3 +1125,20 @@ out:
FREE_AND_NULL(ssh_signing_key_file); FREE_AND_NULL(ssh_signing_key_file);
return ret; return ret;
} }
int parse_sign_mode(const char *arg, enum sign_mode *mode)
{
if (!strcmp(arg, "abort"))
*mode = SIGN_ABORT;
else if (!strcmp(arg, "verbatim") || !strcmp(arg, "ignore"))
*mode = SIGN_VERBATIM;
else if (!strcmp(arg, "warn-verbatim") || !strcmp(arg, "warn"))
*mode = SIGN_WARN_VERBATIM;
else if (!strcmp(arg, "warn-strip"))
*mode = SIGN_WARN_STRIP;
else if (!strcmp(arg, "strip"))
*mode = SIGN_STRIP;
else
return -1;
return 0;
}

15
gpg-interface.h
View File

@@ -104,4 +104,19 @@ int check_signature(struct signature_check *sigc,
void print_signature_buffer(const struct signature_check *sigc, void print_signature_buffer(const struct signature_check *sigc,
unsigned flags); unsigned flags);
/* Modes for --signed-tags=<mode> and --signed-commits=<mode> options. */
enum sign_mode {
SIGN_ABORT,
SIGN_WARN_VERBATIM,
SIGN_VERBATIM,
SIGN_WARN_STRIP,
SIGN_STRIP,
};
/*
* Return 0 if `arg` can be parsed into an `enum sign_mode`. Return -1
* otherwise.
*/
int parse_sign_mode(const char *arg, enum sign_mode *mode);
#endif #endif