push: hedge code of default=simple
`simple` is the most important mode so move the relevant code to its own function to make it easier to see what it's doing. Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 31, 2021 at 14:32 UTC
3b9fd8361f1ed98f06df24d406b9a618c7f39df1
1 file changed
+9
-4
builtin/push.c
+9
-4
@@ -223,6 +223,14 @@ static void setup_push_current(struct remote *remote, struct branch *branch)
223
refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname);
224
}
225
226
+static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote)
227
+{
228
+ if (!same_remote)
229
+ setup_push_current(remote, branch);
230
+ else
231
+ setup_push_upstream(remote, branch, same_remote, 1);
232
+}
233
+
234
static int is_same_remote(struct remote *remote)
235
{
236
struct remote *fetch_remote = remote_get(NULL);
@@ -242,10 +250,7 @@ static void setup_default_push_refspecs(struct remote *remote)
250
251
case PUSH_DEFAULT_UNSPECIFIED:
252
case PUSH_DEFAULT_SIMPLE:
245
- if (!same_remote)
246
- setup_push_current(remote, branch);
247
- else
248
- setup_push_upstream(remote, branch, same_remote, 1);
253
+ setup_push_simple(remote, branch, same_remote);
254
break;
255
256
case PUSH_DEFAULT_UPSTREAM: