Re: [RFC/PATCH] fetch: bigger forced-update warnings

From: Thomas Rast <trast@student.ethz.ch>
Date: Sep 7, 2011, 22:42 UTC
Message-ID: <201109080042.45980.trast@student.ethz.ch>
In-Reply-To: <20110907212042.GG13364@sigill.intra.peff.net>

Jeff King wrote:

Show 5 quoted lines

> On Mon, Sep 05, 2011 at 02:14:57PM -0700, Shawn O. Pearce wrote:
> 
> > > Right. What I mean is, what should the bigger warning look like?
> > 
> > Its a bikeshed. I refuse to paint bikesheds. :-)

[...]

> +	if (uncommon_forced_update)
> +		warning("HEY STUPID FIX YOUR TOPICS");

Whatever comes out of the bikeshedding, I'm going to keep a patch locally that refreshes the mental picture of Shawn shouting that!

That being said, I think there should be a multiline warning pointing the user at the "recovering from upstream rebase" section in git-rebase(1). At least by default with an advice.* setting to disable it.

> +       if (!prefixcmp(message, "fetch: fast-forward"))
> +               uc->fastforward++;
> +       else if (!prefixcmp(message, "fetch: forced-update\n"))
> +               uc->forced++;

That doesn't work: fetch puts the whole command line there. E.g.

  git fetch altgit
  --> fetch altgit: fast-forward

  git fetch altgit next:refs/remotes/next
  --> fetch altgit next:remotes/altgit/next: fast-forward

There's also a minor subtlety here that I had to double-check first: the message for a branch creation is 'storing head', so the later check

> +       return uc.fastforward && uc.forced <= 1; /* 1 for the one we just did */

never triggers at the second fetch.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch