From: ZheNing Hu <adlternative@xxxxxxxxx>
Beacuse `git commit --trailer="Signed-off-by: \
$(git config user.name) <$(git config user.email)>"`
is difficult for users to add their own identities,
so teach interpret-trailers a new option `--own-identity`
which allow those trailers with no value add the user’s own
identity. This will help the use of `commit --trailer` as
easy as `--signoff`.
Signed-off-by: ZheNing Hu <adlternative@xxxxxxxxx>
---
Documentation/git-interpret-trailers.txt | 14 ++++++++++++++
builtin/interpret-trailers.c | 6 ++++--
t/t7513-interpret-trailers.sh | 12 ++++++++++++
trailer.c | 18 ++++++++++++++++--
trailer.h | 3 ++-
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 96ec6499f001..ace44446c3e3 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -84,6 +84,19 @@ OPTIONS
trailer to the input messages. See the description of this
command.
+--own-identity::
+ Used with `--trailer`. Those trailers without value with the
+ `--own-identity` option all will add the user's own identity.
+ For example,` git interpret-trailers --trailer "A:B" --trailer \
+ "Signed-off-by" --trailer "Helped-by" --own-identity --inplace a.txt`
+ will output:
+ "
+ A:B
+ Signed-off-by: C O Mitter <committer@xxxxxxxxxxx>
+ Helped-by: C O Mitter <committer@xxxxxxxxxxx>
+ "
+ in `a.txt`.
+
--where <placement>::
--no-where::
Specify where all new trailers will be added. A setting
@@ -131,6 +144,7 @@ OPTIONS
when you know your input contains just the commit message itself
(and not an email or the output of `git format-patch`).
+
CONFIGURATION VARIABLES
-----------------------
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 84748eafc01b..be7f502a58d7 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -47,6 +47,7 @@ static void new_trailers_clear(struct list_head *trailers)
list_for_each_safe(pos, tmp, trailers) {
item = list_entry(pos, struct new_trailer_item, list);
list_del(pos);
+ free(item->text);
free(item);
}
}
@@ -66,7 +67,7 @@ static int option_parse_trailer(const struct option *opt,
return -1;
item = xmalloc(sizeof(*item));
- item->text = arg;
+ item->text = xstrdup(arg);
item->where = where;
item->if_exists = if_exists;
item->if_missing = if_missing;
@@ -94,7 +95,8 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
-
+ OPT_BOOL(0, "own-identity", &opts.own_identity,
+ N_("specify the user's own identity for omitted trailers value")),
OPT_CALLBACK(0, "where", NULL, N_("action"),
N_("where to place the new trailer"), option_parse_where),
OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 6602790b5f4c..f82cee93bfb2 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -63,6 +63,18 @@ test_expect_success 'without config' '
test_cmp expected actual
'
+test_expect_success 'without config with --own-identity' '
+ cat >expected <<-\EOF &&
+
+ Acked-by: A B <C>
+ Helped-by: C O Mitter <committer@xxxxxxxxxxx>
+ Signed-off-by: C O Mitter <committer@xxxxxxxxxxx>
+ EOF
+ git interpret-trailers --trailer "Acked-by: A B <C>" --trailer "Helped-by" \
+ --trailer "Signed-off-by" --own-identity empty >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'without config in another order' '
sed -e "s/ Z\$/ /" >expected <<-\EOF &&
diff --git a/trailer.c b/trailer.c
index 249ed618ed8e..cd4f85e71c9a 100644
--- a/trailer.c
+++ b/trailer.c
@@ -690,8 +690,18 @@ static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
list_add_tail(&new_item->list, arg_head);
}
+static void add_user_own_identity(struct new_trailer_item *item)
+{
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addstr(&buf, item->text);
+ strbuf_add(&buf, "=", 1);
+ strbuf_addstr(&buf, fmt_name(WANT_COMMITTER_IDENT));
+ free(item->text);
+ item->text = buf.buf;
+}
+
static void process_command_line_args(struct list_head *arg_head,
- struct list_head *new_trailer_head)
+ struct list_head *new_trailer_head, int own_identity)
{
struct arg_item *item;
struct strbuf tok = STRBUF_INIT;
@@ -728,6 +738,10 @@ static void process_command_line_args(struct list_head *arg_head,
error(_("empty trailer token in trailer '%.*s'"),
(int) sb.len, sb.buf);
strbuf_release(&sb);
+ } else if (separator_pos == -1 && own_identity) {
+ add_user_own_identity(tr);
+ pos = pos->prev;
+ continue;
} else {
parse_trailer(&tok, &val, &conf, tr->text,
separator_pos);
@@ -1048,7 +1062,7 @@ void process_trailers(const char *file,
if (!opts->only_input) {
LIST_HEAD(arg_head);
- process_command_line_args(&arg_head, new_trailer_head);
+ process_command_line_args(&arg_head, new_trailer_head ,opts->own_identity);
process_trailers_lists(&head, &arg_head);
}
diff --git a/trailer.h b/trailer.h
index 795d2fccfd95..235dfdfa1978 100644
--- a/trailer.h
+++ b/trailer.h
@@ -57,7 +57,7 @@ struct trailer_info {
struct new_trailer_item {
struct list_head list;
- const char *text;
+ char *text;
enum trailer_where where;
enum trailer_if_exists if_exists;
@@ -73,6 +73,7 @@ struct process_trailer_options {
int no_divider;
int key_only;
int value_only;
+ int own_identity;
const struct strbuf *separator;
const struct strbuf *key_value_separator;
int (*filter)(const struct strbuf *, void *);
--
gitgitgadget
