); SAEximRunCond expanded to false
If there is a trailer "foobar" in configuration a trailer "foo" in
input shouldn't match that, except in `--trailer` arguments as a
shortcut.
Signed-off-by: Anders Waldenborg <anders@xxxxxxx>
---
t/t7513-interpret-trailers.sh | 17 +++++++++++++----
trailer.c | 14 +++++++++-----
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index a99d6d7e3b..9e06fa4454 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -151,8 +151,7 @@ test_expect_success 'spelling and separators are not canonicalized with --parse
test_cmp expected actual
'
-# Matching currently is prefix matching, causing "This-trailer" to be normalized too
-test_expect_failure 'config option matches exact only' '
+test_expect_success 'config option matches exact only' '
cat >patch <<-\EOF &&
This-trailer: a
@@ -171,8 +170,7 @@ test_expect_failure 'config option matches exact only' '
test_cmp expected actual
'
-# Matching currently uses the config key even if key value is different
-test_expect_failure 'config option matches exact only' '
+test_expect_success 'config option matches exact only' '
cat >patch <<-\EOF &&
Ticket: 1234
@@ -550,6 +548,17 @@ test_expect_success 'with config setup' '
test_cmp expected actual
'
+test_expect_success 'trailer on commandline can be prefix of configured' '
+ cat >expected <<-\EOF &&
+
+ Acked-by: 10
+ EOF
+ git interpret-trailers --trailer "A=10" empty >actual &&
+ test_cmp expected actual
+'
+
+
+
test_expect_success 'with config setup and ":=" as separators' '
git config trailer.separators ":=" &&
git config trailer.ack.key "Acked-by= " &&
diff --git a/trailer.c b/trailer.c
index 0db3bba3b1..b00b35ea0e 100644
--- a/trailer.c
+++ b/trailer.c
@@ -605,14 +605,18 @@ static int token_matches_conf(const char *tok, const struct conf_info *conf, siz
return conf->key ? !strncasecmp(tok, conf->key, tok_len) : 0;
}
-static const struct conf_info *lookup_conf_for_tok(const struct strbuf *tok)
+static const struct conf_info *lookup_conf_for_tok(const struct strbuf *tok, int strict)
{
struct conf_info_item *item;
struct list_head *pos;
list_for_each(pos, &conf_head) {
item = list_entry(pos, struct conf_info_item, list);
- if (token_matches_conf(tok->buf, &item->conf, tok->len)) {
+ if (strict) {
+ const char *match = item->conf.key ? item->conf.key : item->conf.name;
+ if (!strcasecmp(match, tok->buf))
+ return &item->conf;
+ } else if (token_matches_conf(tok->buf, &item->conf, tok->len)) {
return &item->conf;
}
}
@@ -750,7 +754,7 @@ static void process_command_line_args(struct list_head *arg_head,
} else {
parse_trailer(&tok, &val, NULL, tr->text,
separator_pos);
- conf = lookup_conf_for_tok(&tok);
+ conf = lookup_conf_for_tok(&tok, 0);
add_arg_item(arg_head,
strbuf_detach(&tok, NULL),
strbuf_detach(&val, NULL),
@@ -1025,7 +1029,7 @@ static size_t process_input_file(FILE *outfile,
const struct conf_info *conf;
parse_trailer(&tok, &val, &sep, trailer,
separator_pos);
- conf = lookup_conf_for_tok(&tok);
+ conf = lookup_conf_for_tok(&tok, 1);
if (opts->unfold)
unfold_value(&val);
add_trailer_item(head,
@@ -1220,7 +1224,7 @@ static void format_trailer_info(struct strbuf *out,
const struct conf_info *conf;
parse_trailer(&tok, &val, NULL, trailer, separator_pos);
- conf = lookup_conf_for_tok(&tok);
+ conf = lookup_conf_for_tok(&tok, 1);
if (!opts->filter ||
opts->filter(&tok, conf ? conf->name : NULL, opts->filter_data)) {
if (opts->unfold)
--
2.25.1
