t4216: avoid unnecessary subshell in test_bloom_filters_not_used

[thirdparty/git.git] / pretty.c

diff --git a/pretty.c b/pretty.c
index 305e903192a7ae4fb125090436130f434bd46e7c..28afc701b6a46d1aca84d7867549391d79a6ab68 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1311,9 +1311,18 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                case '?':
                        switch (c->signature_check.result) {
                        case 'G':
+                               switch (c->signature_check.trust_level) {
+                               case TRUST_UNDEFINED:
+                               case TRUST_NEVER:
+                                       strbuf_addch(sb, 'U');
+                                       break;
+                               default:
+                                       strbuf_addch(sb, 'G');
+                                       break;
+                               }
+                               break;
                        case 'B':
                        case 'E':
-                       case 'U':
                        case 'N':
                        case 'X':
                        case 'Y':
@@ -1337,6 +1346,25 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                        if (c->signature_check.primary_key_fingerprint)
                                strbuf_addstr(sb, c->signature_check.primary_key_fingerprint);
                        break;
+               case 'T':
+                       switch (c->signature_check.trust_level) {
+                       case TRUST_UNDEFINED:
+                               strbuf_addstr(sb, "undefined");
+                               break;
+                       case TRUST_NEVER:
+                               strbuf_addstr(sb, "never");
+                               break;
+                       case TRUST_MARGINAL:
+                               strbuf_addstr(sb, "marginal");
+                               break;
+                       case TRUST_FULLY:
+                               strbuf_addstr(sb, "fully");
+                               break;
+                       case TRUST_ULTIMATE:
+                               strbuf_addstr(sb, "ultimate");
+                               break;
+                       }
+                       break;
                default:
                        return 0;
                }
@@ -1581,9 +1609,9 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
                        strbuf_setlen(sb, sb->len - 1);
        } else if (orig_len != sb->len) {
                if (magic == ADD_LF_BEFORE_NON_EMPTY)
-                       strbuf_insert(sb, orig_len, "\n", 1);
+                       strbuf_insertstr(sb, orig_len, "\n");
                else if (magic == ADD_SP_BEFORE_NON_EMPTY)
-                       strbuf_insert(sb, orig_len, " ", 1);
+                       strbuf_insertstr(sb, orig_len, " ");
        }
        return consumed + 1;
 }