summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2018-02-01 20:57:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-02 20:17:51 (GMT)
commit1cf823fb68cae95fa1887e9eaa314c2b6e619e09 (patch)
tree0ffcd36f573a6855301ec55376d48d43ff4fd91b /builtin/reset.c
parent42e6fde5c28150206956ea4be490d886c4ecbd68 (diff)
downloadgit-1cf823fb68cae95fa1887e9eaa314c2b6e619e09.zip
git-1cf823fb68cae95fa1887e9eaa314c2b6e619e09.tar.gz
git-1cf823fb68cae95fa1887e9eaa314c2b6e619e09.tar.bz2
reset --hard: make use of the pretty machinery
reset --hard currently uses its own logic for printing the first line of the commit message in its output. Instead of just using the first line, use the pretty machinery to create the output. In addition to the easier to follow code, this makes the output more consistent with other commands that print the title of the commit, such as 'git commit --oneline' or 'git checkout', which both use 'pp_commit_easy()' with the CMIT_FMT_ONELINE modifier. It is a slight change of the output if the second line of the commit message is not a blank line, i.e. if the commit message is foo bar previously we would print "HEAD is now at 000000 foo", while after this change we print "HEAD is now at 000000 foo bar", same as 'git log --oneline' shows "000000 foo bar". So this does make the output more consistent with other commands, and 'reset' is a porcelain command, so nobody should be parsing the output in scripts. The current behaviour dates back to 0e5a7faa3a ("Make "git reset" a builtin.", 2007-09-11), so I assume (without digging into the old codebase too much) that the logic was implemented because there was no convenience function such as 'pp_commit_easy' that would do this already. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c28
1 files changed, 10 insertions, 18 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index fc3b906..651d983 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -93,24 +93,16 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
static void print_new_head_line(struct commit *commit)
{
- const char *hex, *body;
- const char *msg;
-
- hex = find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
- printf(_("HEAD is now at %s"), hex);
- msg = logmsg_reencode(commit, NULL, get_log_output_encoding());
- body = strstr(msg, "\n\n");
- if (body) {
- const char *eol;
- size_t len;
- body = skip_blank_lines(body + 2);
- eol = strchr(body, '\n');
- len = eol ? eol - body : strlen(body);
- printf(" %.*s\n", (int) len, body);
- }
- else
- printf("\n");
- unuse_commit_buffer(commit, msg);
+ struct strbuf buf = STRBUF_INIT;
+
+ printf(_("HEAD is now at %s"),
+ find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+
+ pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
+ if (buf.len > 0)
+ printf(" %s", buf.buf);
+ putchar('\n');
+ strbuf_release(&buf);
}
static void update_index_from_diff(struct diff_queue_struct *q,