summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-commit.c10
-rwxr-xr-xt/t7502-commit.sh4
2 files changed, 6 insertions, 8 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index f4c73442cf..7b7a51a168 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -1136,13 +1136,11 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
initial_commit ? " (root-commit)" : "");
if (!log_tree_commit(&rev, commit)) {
- struct pretty_print_context ctx = {0};
- struct strbuf buf = STRBUF_INIT;
- ctx.date_mode = DATE_NORMAL;
- format_commit_message(commit, format.buf + 7, &buf, &ctx);
- printf("%s\n", buf.buf);
- strbuf_release(&buf);
+ rev.always_show_header = 1;
+ rev.use_terminator = 1;
+ log_tree_commit(&rev, commit);
}
+
strbuf_release(&format);
}
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index b10541d4d3..08c0247ac3 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -36,12 +36,12 @@ test_expect_success 'output summary format' '
check_summary_oneline "" "a change"
'
-test_expect_failure 'output summary format for commit with an empty diff' '
+test_expect_success 'output summary format for commit with an empty diff' '
check_summary_oneline "" "empty" "--allow-empty"
'
-test_expect_failure 'output summary format for merges' '
+test_expect_success 'output summary format for merges' '
git checkout -b recursive-base &&
test_commit base file1 &&