| Message ID | 20210529074458.1916817-6-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
Felipe Contreras <felipe.contreras@gmail.com> writes: > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > builtin/push.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > diff --git a/builtin/push.c b/builtin/push.c > index a2abacf64d..4b3a14278a 100644 > --- a/builtin/push.c > +++ b/builtin/push.c > @@ -243,7 +243,7 @@ static int is_workflow_triangular(struct remote *remote) > > static void setup_default_push_refspecs(struct remote *remote) > { > - struct branch *branch = branch_get(NULL); > + struct branch *branch; > int triangular = is_workflow_triangular(remote); > > switch (push_default) { > @@ -258,6 +258,7 @@ static void setup_default_push_refspecs(struct remote *remote) > default: Not a fault of this step, but please make it a habit to have "break;" here. case label with absolutely no body just looks strange and is distracting to the eyes. > } > > + branch = branch_get(NULL); > if (!branch) > die(_(message_detached_head_die), remote->name); This step is the true justification for the splitting of a single switch into two switches done in [03/15]. Makes quite a lot of sense.
Junio C Hamano wrote: > Felipe Contreras <felipe.contreras@gmail.com> writes: > > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > > --- > > builtin/push.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/builtin/push.c b/builtin/push.c > > index a2abacf64d..4b3a14278a 100644 > > --- a/builtin/push.c > > +++ b/builtin/push.c > > @@ -243,7 +243,7 @@ static int is_workflow_triangular(struct remote *remote) > > > > static void setup_default_push_refspecs(struct remote *remote) > > { > > - struct branch *branch = branch_get(NULL); > > + struct branch *branch; > > int triangular = is_workflow_triangular(remote); > > > > switch (push_default) { > > @@ -258,6 +258,7 @@ static void setup_default_push_refspecs(struct remote *remote) > > default: > > Not a fault of this step, but please make it a habit to have > "break;" here. case label with absolutely no body just looks > strange and is distracting to the eyes. All right. > > } > > > > + branch = branch_get(NULL); > > if (!branch) > > die(_(message_detached_head_die), remote->name); > > This step is the true justification for the splitting of a single > switch into two switches done in [03/15]. Makes quite a lot of > sense. It is one, not the only one. But yeah, the most readily apparent.
diff --git a/builtin/push.c b/builtin/push.c index a2abacf64d..4b3a14278a 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -243,7 +243,7 @@ static int is_workflow_triangular(struct remote *remote) static void setup_default_push_refspecs(struct remote *remote) { - struct branch *branch = branch_get(NULL); + struct branch *branch; int triangular = is_workflow_triangular(remote); switch (push_default) { @@ -258,6 +258,7 @@ static void setup_default_push_refspecs(struct remote *remote) default: } + branch = branch_get(NULL); if (!branch) die(_(message_detached_head_die), remote->name);
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- builtin/push.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)