summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-10-31 09:25:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-31 20:47:35 (GMT)
commitc44726438fbdb193c86ee68d53933597a2e10dcb (patch)
treef106d1a19cbf9c779ee8b20d519715fae220a80a /builtin/describe.c
parent23cd01ec53abd9a814d6a565a1e40333ae785611 (diff)
downloadgit-c44726438fbdb193c86ee68d53933597a2e10dcb.zip
git-c44726438fbdb193c86ee68d53933597a2e10dcb.tar.gz
git-c44726438fbdb193c86ee68d53933597a2e10dcb.tar.bz2
describe: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/describe.c')
-rw-r--r--builtin/describe.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index b9d3603..6f62109 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -9,7 +9,7 @@
#include "hash.h"
#include "argv-array.h"
-#define SEEN (1u<<0)
+#define SEEN (1u << 0)
#define MAX_TAGS (FLAG_BITS - 1)
static const char * const describe_usage[] = {
@@ -36,7 +36,6 @@ static const char *diff_index_args[] = {
"diff-index", "--quiet", "HEAD", "--", NULL
};
-
struct commit_name {
struct commit_name *next;
unsigned char peeled[20];
@@ -46,6 +45,7 @@ struct commit_name {
unsigned char sha1[20];
char *path;
};
+
static const char *prio_names[] = {
"head", "lightweight", "annotated",
};
@@ -488,9 +488,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
} else if (dirty) {
die(_("--dirty is incompatible with commit-ishes"));
} else {
- while (argc-- > 0) {
+ while (argc-- > 0)
describe(*argv++, argc == 0);
- }
}
return 0;
}