[PATCH] git-describe: Show HEAD by default.
From: Andreas Ericsson <hidden>
Date: 2016-06-15 22:42:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Andreas Ericsson <redacted> --- describe.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) b3c6fee2b1dda213fe8439da2c14189abab9bdf7
diff --git a/describe.c b/describe.c
index a0180f5..fda4102 100644
--- a/describe.c
+++ b/describe.c@@ -98,11 +98,20 @@ static int compare_names(const void *_a, return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; } -static void describe(struct commit *cmit) +static void describe(const char *ref) { struct commit_list *list; static int initialized = 0; struct commit_name *n; + unsigned char sha1[20]; + struct commit *cmit; + + if (get_sha1(ref, sha1) < 0) + usage(describe_usage); + + cmit = lookup_commit_reference(sha1); + if (!cmit) + usage(describe_usage); if (!initialized) { initialized = 1;
@@ -132,12 +141,10 @@ static void describe(struct commit *cmit int main(int argc, char **argv) { - int i; + int i, desc = 0; for (i = 1; i < argc; i++) { const char *arg = argv[i]; - unsigned char sha1[20]; - struct commit *cmit; if (!strcmp(arg, "--all")) { all = 1;
@@ -153,12 +160,12 @@ int main(int argc, char **argv) abbrev = DEFAULT_ABBREV; continue; } - if (get_sha1(arg, sha1) < 0) - usage(describe_usage); - cmit = lookup_commit_reference(sha1); - if (!cmit) - usage(describe_usage); - describe(cmit); + describe(arg); + desc++; } + + if (!desc) + describe("HEAD"); + return 0; }
--
1.1.0