diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 21:49:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 21:49:52 (GMT) |
| commit | 3434569fc206c2f4bc434571d202f2961aa905e5 (patch) | |
| tree | 87899124d519d771b5b4c15a779ae594ef44d801 /builtin | |
| parent | e07074d3f0f0efcb6cef30dc603d75c595942431 (diff) | |
| parent | 3b3357626edc841a51d8885ddf6986bab5b6f778 (diff) | |
| download | git-3434569fc206c2f4bc434571d202f2961aa905e5.zip git-3434569fc206c2f4bc434571d202f2961aa905e5.tar.gz git-3434569fc206c2f4bc434571d202f2961aa905e5.tar.bz2 | |
Merge branch 'nd/style-opening-brace'
Code clean-up.
* nd/style-opening-brace:
style: the opening '{' of a function is in a separate line
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/config.c | 3 | ||||
| -rw-r--r-- | builtin/push.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index 84385ef..99bc7ef 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -164,7 +164,8 @@ static NORETURN void usage_builtin_config(void) usage_with_options(builtin_config_usage, builtin_config_options); } -static void check_argc(int argc, int min, int max) { +static void check_argc(int argc, int min, int max) +{ if (argc >= min && argc <= max) return; if (min == max) diff --git a/builtin/push.c b/builtin/push.c index ee1e842..021dd3b 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -143,7 +143,9 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p) return remote->url_nr; } -static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) { +static NORETURN int die_push_simple(struct branch *branch, + struct remote *remote) +{ /* * There's no point in using shorten_unambiguous_ref here, * as the ambiguity would be on the remote side, not what |