summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:52 -0800
commit3434569fc206c2f4bc434571d202f2961aa905e5 (patch)
tree87899124d519d771b5b4c15a779ae594ef44d801 /builtin
parentMerge branch 'ds/gc-doc-typofix' (diff)
parentstyle: the opening '{' of a function is in a separate line (diff)
downloadtgif-3434569fc206c2f4bc434571d202f2961aa905e5.tar.xz
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.c3
-rw-r--r--builtin/push.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 84385ef165..99bc7ef64e 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 ee1e842027..021dd3b1e4 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