Merge branch 'fc/pull-cleanups'
Code cleanup. * fc/pull-cleanups: pull: trivial whitespace style fix pull: trivial cleanup pull: cleanup autostash check
This commit is contained in:
commit
221ec24e9b
@ -947,7 +947,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||||||
struct oid_array merge_heads = OID_ARRAY_INIT;
|
struct oid_array merge_heads = OID_ARRAY_INIT;
|
||||||
struct object_id orig_head, curr_head;
|
struct object_id orig_head, curr_head;
|
||||||
struct object_id rebase_fork_point;
|
struct object_id rebase_fork_point;
|
||||||
int autostash;
|
|
||||||
int rebase_unspecified = 0;
|
int rebase_unspecified = 0;
|
||||||
int can_ff;
|
int can_ff;
|
||||||
|
|
||||||
@ -982,8 +981,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||||||
if (get_oid("HEAD", &orig_head))
|
if (get_oid("HEAD", &orig_head))
|
||||||
oidclr(&orig_head);
|
oidclr(&orig_head);
|
||||||
|
|
||||||
autostash = config_autostash;
|
|
||||||
if (opt_rebase) {
|
if (opt_rebase) {
|
||||||
|
int autostash = config_autostash;
|
||||||
if (opt_autostash != -1)
|
if (opt_autostash != -1)
|
||||||
autostash = opt_autostash;
|
autostash = opt_autostash;
|
||||||
|
|
||||||
@ -1054,7 +1053,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
if (opt_rebase) {
|
if (opt_rebase) {
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
int ran_ff = 0;
|
|
||||||
|
|
||||||
struct object_id newbase;
|
struct object_id newbase;
|
||||||
struct object_id upstream;
|
struct object_id upstream;
|
||||||
@ -1065,16 +1063,14 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||||||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
|
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
|
||||||
submodule_touches_in_range(the_repository, &upstream, &curr_head))
|
submodule_touches_in_range(the_repository, &upstream, &curr_head))
|
||||||
die(_("cannot rebase with locally recorded submodule modifications"));
|
die(_("cannot rebase with locally recorded submodule modifications"));
|
||||||
if (!autostash) {
|
|
||||||
if (can_ff) {
|
if (can_ff) {
|
||||||
/* we can fast-forward this without invoking rebase */
|
/* we can fast-forward this without invoking rebase */
|
||||||
opt_ff = "--ff-only";
|
opt_ff = "--ff-only";
|
||||||
ran_ff = 1;
|
|
||||||
ret = run_merge();
|
ret = run_merge();
|
||||||
}
|
} else {
|
||||||
}
|
|
||||||
if (!ran_ff)
|
|
||||||
ret = run_rebase(&newbase, &upstream);
|
ret = run_rebase(&newbase, &upstream);
|
||||||
|
}
|
||||||
|
|
||||||
if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
|
if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
|
||||||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
|
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user