| Message ID | 20210613045949.255090-3-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pull: obvious fixes | expand |
On Sat, Jun 12, 2021 at 9:59 PM Felipe Contreras <felipe.contreras@gmail.com> wrote: > > There's no need to store ran_ff. Now it's obvious from the conditionals. > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > builtin/pull.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/builtin/pull.c b/builtin/pull.c > index a22293b7db..80e2f55cbc 100644 > --- a/builtin/pull.c > +++ b/builtin/pull.c > @@ -1053,7 +1053,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix) > > if (opt_rebase) { > int ret = 0; > - int ran_ff = 0; > > struct object_id newbase; > struct object_id upstream; > @@ -1068,11 +1067,10 @@ int cmd_pull(int argc, const char **argv, const char *prefix) > if (can_ff) { > /* we can fast-forward this without invoking rebase */ > opt_ff = "--ff-only"; > - ran_ff = 1; > ret = run_merge(); > - } > - if (!ran_ff) > + } else { > ret = run_rebase(&newbase, &upstream); > + } > > if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON || > recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)) > -- > 2.32.0 Makes sense.
diff --git a/builtin/pull.c b/builtin/pull.c index a22293b7db..80e2f55cbc 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -1053,7 +1053,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase) { int ret = 0; - int ran_ff = 0; struct object_id newbase; struct object_id upstream; @@ -1068,11 +1067,10 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (can_ff) { /* we can fast-forward this without invoking rebase */ opt_ff = "--ff-only"; - ran_ff = 1; ret = run_merge(); - } - if (!ran_ff) + } else { ret = run_rebase(&newbase, &upstream); + } if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON || recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
There's no need to store ran_ff. Now it's obvious from the conditionals. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- builtin/pull.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)