Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
describe: trivial style fixes
author
Felipe Contreras
<felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:25:41 +0000
(
03:25
-0600)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 31 Oct 2013 20:47:35 +0000
(13:47 -0700)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/describe.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
23cd01e
)
diff --git
a/builtin/describe.c
b/builtin/describe.c
index b9d36037041deac869a2fa498e823bd7f315c2ba..6f6210988709dc866bf79a5bb5523356773b93a0 100644
(file)
--- a/
builtin/describe.c
+++ b/
builtin/describe.c
@@
-9,7
+9,7
@@
#include "hash.h"
#include "argv-array.h"
#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[] = {
#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
};
"diff-index", "--quiet", "HEAD", "--", NULL
};
-
struct commit_name {
struct commit_name *next;
unsigned char peeled[20];
struct commit_name {
struct commit_name *next;
unsigned char peeled[20];
@@
-46,6
+45,7
@@
struct commit_name {
unsigned char sha1[20];
char *path;
};
unsigned char sha1[20];
char *path;
};
+
static const char *prio_names[] = {
"head", "lightweight", "annotated",
};
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 {
} else if (dirty) {
die(_("--dirty is incompatible with commit-ishes"));
} else {
- while (argc-- > 0)
{
+ while (argc-- > 0)
describe(*argv++, argc == 0);
describe(*argv++, argc == 0);
- }
}
return 0;
}
}
return 0;
}