From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2015 21:09:57 +0000 (-0700)
Subject: Merge branch 'sb/parse-options-codeformat'
X-Git-Tag: v2.6.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=535efaf6beb039b9f3b6f6c0f2b526eb8d02f99b;p=thirdparty%2Fgit.git

Merge branch 'sb/parse-options-codeformat'

* sb/parse-options-codeformat:
  parse-options: align curly braces for all options
---

535efaf6beb039b9f3b6f6c0f2b526eb8d02f99b
diff --cc parse-options.h
index 6ca8388a53,08d7818935..3f1cc3aee0
--- a/parse-options.h
+++ b/parse-options.h
@@@ -127,11 -126,9 +127,11 @@@ struct option 
  #define OPT_BOOL(s, l, v, h)        OPT_SET_INT(s, l, v, h, 1)
  #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
  				      (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
- #define OPT_CMDMODE(s, l, v, h, i) { OPTION_CMDMODE, (s), (l), (v), NULL, \
+ #define OPT_CMDMODE(s, l, v, h, i)  { OPTION_CMDMODE, (s), (l), (v), NULL, \
  				      (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
  #define OPT_INTEGER(s, l, v, h)     { OPTION_INTEGER, (s), (l), (v), N_("n"), (h) }
 +#define OPT_MAGNITUDE(s, l, v, h)   { OPTION_MAGNITUDE, (s), (l), (v), \
 +				      N_("n"), (h), PARSE_OPT_NONEG }
  #define OPT_STRING(s, l, v, a, h)   { OPTION_STRING,  (s), (l), (v), (a), (h) }
  #define OPT_STRING_LIST(s, l, v, a, h) \
  				    { OPTION_CALLBACK, (s), (l), (v), (a), \