[PATCH 2/3] pretty: make %H/%h dependent on --abbrev[-commit]
From: Will Palmer <hidden>
Date: 2016-06-15 22:48:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
Prior to this, the output of %H was always 40 characters long, and the output of %h always DEFAULT_ABBREV characters long, without regard to whether --abbrev-commit or --abbrev had been passed. Here we make "git log --pretty=%H --abbrev-commit" synonymous with "git log --pretty=%h", and make %h/abbreviated-%H respect the length specified for --abbrev. The same is applied to other commit-placeholders %P and %p, and --abbrev is respected for %t, though %T is not changed. Signed-off-by: Will Palmer <redacted> --- builtin/rev-list.c | 1 + builtin/shortlog.c | 2 ++ commit.h | 1 + log-tree.c | 2 ++ pretty.c | 30 +++++++++++++++++++----------- 5 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 5a53862..1d1e59c 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c@@ -98,6 +98,7 @@ static void show_commit(struct commit *commit, void *data) struct strbuf buf = STRBUF_INIT; struct pretty_print_context ctx = {0}; ctx.abbrev = revs->abbrev; + ctx.abbrev_commit = revs->abbrev_commit; ctx.date_mode = revs->date_mode; ctx.use_color = DIFF_OPT_TST(&revs->diffopt, COLOR_DIFF); pretty_print_commit(revs->commit_format, commit, &buf, &ctx);
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 7aee491..5c0721c 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c@@ -143,6 +143,8 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit, struct rev struct strbuf ufbuf = STRBUF_INIT; struct pretty_print_context ctx = {0}; + ctx.abbrev = rev->abbrev; + ctx.abbrev_commit = rev->abbrev_commit; ctx.use_color = DIFF_OPT_TST(&rev->diffopt, COLOR_DIFF); pretty_print_commit(CMIT_FMT_RAW, commit, &buf, &ctx); buffer = buf.buf;
diff --git a/commit.h b/commit.h
index b6caf91..7a476a0 100644
--- a/commit.h
+++ b/commit.h@@ -72,6 +72,7 @@ struct pretty_print_context int need_8bit_cte; int show_notes; int use_color; + int abbrev_commit; struct reflog_walk_info *reflog_info; };
diff --git a/log-tree.c b/log-tree.c
index b743c43..9bd4f47 100644
--- a/log-tree.c
+++ b/log-tree.c@@ -282,6 +282,8 @@ void show_log(struct rev_info *opt, int use_color) int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40; const char *extra_headers = opt->extra_headers; struct pretty_print_context ctx = {0}; + ctx.abbrev = opt->abbrev; + ctx.abbrev_commit = opt->abbrev_commit; ctx.use_color = use_color; opt->loginfo = NULL;
diff --git a/pretty.c b/pretty.c
index fdb5e16..f884f48 100644
--- a/pretty.c
+++ b/pretty.c@@ -725,13 +725,16 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, switch (placeholder[0]) { case 'H': /* commit hash */ - strbuf_addstr(sb, sha1_to_hex(commit->object.sha1)); - return 1; case 'h': /* abbreviated commit hash */ + if (placeholder[0] != 'h' && !c->pretty_ctx->abbrev_commit) { + strbuf_addstr(sb, sha1_to_hex(commit->object.sha1)); + return 1; + } + if (add_again(sb, &c->abbrev_commit_hash)) return 1; strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1, - DEFAULT_ABBREV)); + c->pretty_ctx->abbrev)); c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off; return 1; case 'T': /* tree hash */
@@ -741,24 +744,29 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, if (add_again(sb, &c->abbrev_tree_hash)) return 1; strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1, - DEFAULT_ABBREV)); + c->pretty_ctx->abbrev)); c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off; return 1; case 'P': /* parent hashes */ - for (p = commit->parents; p; p = p->next) { - if (p != commit->parents) - strbuf_addch(sb, ' '); - strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1)); - } - return 1; case 'p': /* abbreviated parent hashes */ + if (placeholder[0] != 'p' && !c->pretty_ctx->abbrev_commit) { + for (p = commit->parents; p; p = p->next) { + if (p != commit->parents) + strbuf_addch(sb, ' '); + strbuf_addstr(sb, + sha1_to_hex(p->item->object.sha1)); + } + return 1; + } + if (add_again(sb, &c->abbrev_parent_hashes)) return 1; for (p = commit->parents; p; p = p->next) { if (p != commit->parents) strbuf_addch(sb, ' '); strbuf_addstr(sb, find_unique_abbrev( - p->item->object.sha1, DEFAULT_ABBREV)); + p->item->object.sha1, + c->pretty_ctx->abbrev)); } c->abbrev_parent_hashes.len = sb->len - c->abbrev_parent_hashes.off;
--
1.7.1.rc1.13.gbb0a0a.dirty