RE: [PATCH v7 5/5] pull: display default warning only when non-ff
From: Felipe Contreras <hidden>
Date: 2020-12-14 21:25:50
Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
@@ -1044,7 +1045,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase && merge_heads.nr > 1) die(_("Cannot rebase onto multiple branches.")); - if (rebase_unspecified && !opt_ff) { + can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]); + + if (rebase_unspecified && !opt_ff && !can_ff) { if (opt_verbosity >= 0) show_advice_pull_non_ff(); }
I strongly predict the conditionals will end up looking similar to:
if (!can_ff) {
if (rebase_unspecified && !opt_ff && opt_verbosity >= 0)
show_advice_pull_non_ff();
}
But OK.
--
Felipe Contreras