summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-31 23:59:27 (GMT)
commit4b05548fc0523744b7a1276cfa0f4aae19d6d9c9 (patch)
treebaf4bc01f49247b8811ed5d87dede2456e8b5eff /rerere.c
parent48793cf46a286a21df420fdd7fc4b0c91c60a0c8 (diff)
downloadgit-4b05548fc0523744b7a1276cfa0f4aae19d6d9c9.zip
git-4b05548fc0523744b7a1276cfa0f4aae19d6d9c9.tar.gz
git-4b05548fc0523744b7a1276cfa0f4aae19d6d9c9.tar.bz2
enums: omit trailing comma for portability
Without this patch at least IBM VisualAge C 5.0 (I have 5.0.2) on AIX 5.1 fails to compile git. enum style is inconsistent already, with some enums declared on one line, some over 3 lines with the enum values all on the middle line, sometimes with 1 enum value per line... and independently of that the trailing comma is sometimes present and other times absent, often mixing with/without trailing comma styles in a single file, and sometimes in consecutive enum declarations. Clearly, omitting the comma is the more portable style, and this patch changes all enum declarations to use the portable omitted dangling comma style consistently. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index f221bed..2197890 100644
--- a/rerere.c
+++ b/rerere.c
@@ -153,7 +153,7 @@ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_siz
git_SHA_CTX ctx;
int hunk_no = 0;
enum {
- RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL,
+ RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL
} hunk = RR_CONTEXT;
struct strbuf one = STRBUF_INIT, two = STRBUF_INIT;
struct strbuf buf = STRBUF_INIT;