Since we want the most important information furthest
left while at the same time preserving valuable screen
estate, we move the branch-name to the leftmost side
of the commit result output. To make it read properly
we get rid of "Created", which I just can't fit into
a sentence without putting the branch-name last.
Having taken inspiration from the "git reset" command,
output for the three conceivable cases now look thus:
normal commit
<branch> is now at b930c4a (i386: Snib the sprock)
detached commit
DETACHED HEAD is now at b930c4a (i386: Snib the sprock)
initial commit
History has begun anew. Root-commit created.
<branch> is now at bc930c4a (i386: Snib the sprock)
As a nice side-effect, we can get rid of the get_commit_format
helper function and thereby remove more code than we add.
This is a substantial rewrite of a patch originally sent by
Jeff King <peff@xxxxxxxx>.
Signed-off-by: Andreas Ericsson <ae@xxxxxx>
---
"Created" is a problem when one wants to put branch-name before the
subject line, because the subject has to follow the hash (it doesn't
describe the pre-state of the branch/detached head), but the newly
added commit. "Created, on branch, hash (subject)" just looks
stilted and stupid, so I had to change it. Hopefully this can be
accepted. If not, count me out.
I'm not sure if the last "else" case setting branch = head; can
ever happen, but I figured it can't hurt to make sure. Feel free
to modify commentary around it or the entire section when applying.
This is based on current next (798a2a426a).
builtin-commit.c | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c
index e4e1448..3b43344 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -878,35 +878,12 @@ int cmd_status(int argc, const char **argv, const char *prefix)
return commitable ? 0 : 1;
}
-static char *get_commit_format_string(void)
-{
- unsigned char sha[20];
- const char *head = resolve_ref("HEAD", sha, 0, NULL);
- struct strbuf buf = STRBUF_INIT;
-
- /* use shouty-caps if we're on detached HEAD */
- strbuf_addf(&buf, "format:%s", strcmp("HEAD", head) ? "" : "DETACHED commit");
- strbuf_addstr(&buf, "%h (%s)");
-
- if (!prefixcmp(head, "refs/heads/")) {
- const char *cp;
- strbuf_addstr(&buf, " on ");
- for (cp = head + 11; *cp; cp++) {
- if (*cp == '%')
- strbuf_addstr(&buf, "%x25");
- else
- strbuf_addch(&buf, *cp);
- }
- }
-
- return strbuf_detach(&buf, NULL);
-}
-
static void print_summary(const char *prefix, const unsigned char *sha1)
{
struct rev_info rev;
struct commit *commit;
- char *format = get_commit_format_string();
+ unsigned char head_sha1[20];
+ const char *branch, *head, *format = "format:%h (%s)";
commit = lookup_commit(sha1);
if (!commit)
@@ -931,15 +908,27 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
rev.diffopt.break_opt = 0;
diff_setup_done(&rev.diffopt);
- printf("Created %s", initial_commit ? "root-commit " : "");
+ /* a pretty rare occurrance, so let's celebrate it specially */
+ if (initial_commit)
+ printf("History has begun anew. Root-commit created.\n");
+
+ head = resolve_ref("HEAD", head_sha1, 0, NULL);
+ if (!strcmp(head, "HEAD"))
+ branch = "DETACHED HEAD";
+ else if (!prefixcmp(head, "refs/heads/"))
+ branch = &head[strlen("refs/heads/")];
+ else {
+ /* refs/git-svn, fe */
+ branch = head;
+ }
+
+ printf("%s is now at ", branch);
if (!log_tree_commit(&rev, commit)) {
struct strbuf buf = STRBUF_INIT;
format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
- printf("%s\n", buf.buf);
- strbuf_release(&buf);
+ printf("%s\n", strbuf_detach(&buf, NULL));
}
- free(format);
}
static int git_commit_config(const char *k, const char *v, void *cb)
--
1.6.0.2.529.g37dbc.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
