Merge branch 'mv/unknown'

* mv/unknown:
Don't use "<unknown>" for placeholders and suppress printing of empty user formats.

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 414b2f32b293c9d6d7ca2a821f903de64ea8ea21..33726b8d8426b4878ed63184dc280957ba4434e0 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -84,7 +84,8 @@ static void show_commit(struct commit *commit)
                strbuf_init(&buf, 0);
                pretty_print_commit(revs.commit_format, commit,
                                        &buf, revs.abbrev, NULL, NULL, revs.date_mode);
-               printf("%s%c", buf.buf, hdr_termination);
+               if (buf.len)
+                       printf("%s%c", buf.buf, hdr_termination);
                strbuf_release(&buf);
        }
        maybe_flush_or_die(stdout, "stdout");

diff --git a/commit.c b/commit.c
index 62cc74d7a9a2e7cddd5048602e4c793269287add..20fb2209cbcbc19343e7e52378e74afef52e3a6e 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -876,9 +876,6 @@ void format_commit_message(const struct commit *commit,
        }
        if (msg[i])
                table[IBODY].value = xstrdup(msg + i);
-       for (i = 0; i < ARRAY_SIZE(table); i++)
-               if (!table[i].value)
-                       interp_set_entry(table, i, "<unknown>");
 
        len = interpolate(sb->buf + sb->len, strbuf_avail(sb),
                                format, table, ARRAY_SIZE(table));

diff --git a/interpolate.c b/interpolate.c
index 3de583238d854675ae872047a2d2b7fb09a66969..6ef53f246511a1943e375d5d5913a4ec52e2c663 100644 (file)
--- a/interpolate.c
+++ b/interpolate.c
@@ -73,8 +73,12 @@ unsigned long interpolate(char *result, unsigned long reslen,
                        /* Check for valid interpolation. */
                        if (i < ninterps) {
                                value = interps[i].value;
-                               valuelen = strlen(value);
+                               if (!value) {
+                                       src += namelen;
+                                       continue;
+                               }
 
+                               valuelen = strlen(value);
                                if (newlen + valuelen < reslen) {
                                        /* Substitute. */
                                        memcpy(dest, value, valuelen);

diff --git a/log-tree.c b/log-tree.c
index 3e5e6acfafb5345b8ed4f67599270e841b194ade..23191543d5324f20622048103a821ded4d13b77a 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -280,7 +280,8 @@ void show_log(struct rev_info *opt, const char *sep)
        if (opt->show_log_size)
                printf("log size %i\n", (int)msgbuf.len);
 
-       printf("%s%s%s", msgbuf.buf, extra, sep);
+       if (msgbuf.len)
+               printf("%s%s%s", msgbuf.buf, extra, sep);
        strbuf_release(&msgbuf);
 }
 

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index ad6d0b8c9da56e22b22d4fd97898f20101964e1f..1e4541afea07daa094895244f0e49803623cd1cd 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -79,9 +79,7 @@ EOF
 
 test_format encoding %e <<'EOF'
 commit 131a310eb913d107dd3c09a65d1651175898735d
-<unknown>
 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
-<unknown>
 EOF
 
 test_format subject %s <<'EOF'
@@ -93,9 +91,7 @@ EOF
 
 test_format body %b <<'EOF'
 commit 131a310eb913d107dd3c09a65d1651175898735d
-<unknown>
 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
-<unknown>
 EOF
 
 test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF'
@@ -121,9 +117,7 @@ test_format complex-encoding %e <<'EOF'
 commit f58db70b055c5718631e5c61528b28b12090cdea
 iso8859-1
 commit 131a310eb913d107dd3c09a65d1651175898735d
-<unknown>
 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
-<unknown>
 EOF
 
 test_format complex-subject %s <<'EOF'
@@ -142,9 +136,7 @@ and it will be encoded in iso8859-1. We should therefore
 include an iso8859 character: ¡bueno!
 
 commit 131a310eb913d107dd3c09a65d1651175898735d
-<unknown>
 commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873
-<unknown>
 EOF
 
 test_done

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index f11ada8617d95e2c3840ed1ecbdb03745d1f6f2b..abbf54ba63693bbb3e839786bf97284c22912333 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -81,7 +81,7 @@ test_expect_success 'explicit commit message should override template' '
        git add foo &&
        GIT_EDITOR=../t7500/add-content git commit --template "$TEMPLATE" \
                -m "command line msg" &&
-       commit_msg_is "command line msg<unknown>"
+       commit_msg_is "command line msg"
 '
 
 test_expect_success 'commit message from file should override template' '
@@ -90,7 +90,7 @@ test_expect_success 'commit message from file should override template' '
        echo "standard input msg" |
                GIT_EDITOR=../t7500/add-content git commit \
                        --template "$TEMPLATE" --file - &&
-       commit_msg_is "standard input msg<unknown>"
+       commit_msg_is "standard input msg"
 '
 
 test_done