mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

describe: trivial style fixes

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2013-10-31 03:25:41 -06:00
committed by Junio C Hamano
parent 23cd01ec53
commit c44726438f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/describe.c
View File

@ -9,7 +9,7 @@
#include "hash.h" #include "hash.h"
#include "argv-array.h" #include "argv-array.h"
#define SEEN (1u<<0) #define SEEN (1u << 0)
#define MAX_TAGS (FLAG_BITS - 1) #define MAX_TAGS (FLAG_BITS - 1)
static const char * const describe_usage[] = { static const char * const describe_usage[] = {
@ -36,7 +36,6 @@ static const char *diff_index_args[] = {
"diff-index", "--quiet", "HEAD", "--", NULL "diff-index", "--quiet", "HEAD", "--", NULL
}; };
struct commit_name { struct commit_name {
struct commit_name *next; struct commit_name *next;
unsigned char peeled[20]; unsigned char peeled[20];
@ -46,6 +45,7 @@ struct commit_name {
unsigned char sha1[20]; unsigned char sha1[20];
char *path; char *path;
}; };
static const char *prio_names[] = { static const char *prio_names[] = {
"head", "lightweight", "annotated", "head", "lightweight", "annotated",
}; };
@ -488,9 +488,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
} else if (dirty) { } else if (dirty) {
die(_("--dirty is incompatible with commit-ishes")); die(_("--dirty is incompatible with commit-ishes"));
} else { } else {
while (argc-- > 0) { while (argc-- > 0)
describe(*argv++, argc == 0); describe(*argv++, argc == 0);
}
} }
return 0; return 0;
} }