RE: [PATCH v7 5/5] pull: display default warning only when non-ff

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 14, 2020, 21:24 UTC
Message-ID: <5fd7d82a9b6ab_d44af208bb@natae.notmuch>
In-Reply-To: <20201214202647.3340193-6-gitster@pobox.com>

Junio C Hamano wrote:

Show 11 quoted lines

> @@ -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