On Thu, Jun 19, 2008 at 01:37:48PM +0000, Jeff King wrote:
quoted text
> On Thu, Jun 19, 2008 at 12:51:55PM +0200, Pierre Habouzit wrote:
>=20
> > It's really painful to have git push error out when it's just that one =
of
quoted text
> > your tracking branches isn't up to date with respect to a remote branch.
> >=20
> > Let just add a new status: "lagging", always print it to screen when we=
're
quoted text
> > lagging, but don't exit with a non 0 value, as it really alarms users.
>=20
> This has been discussed before, and the suggested term was "stale".
>=20
> Check out:
>=20
>   http://thread.gmane.org/gmane.comp.version-control.git/73038/focus=3D73=
186
quoted text
>=20
> which is uncannily identical (the difference is the name, and that I
> don't show the lagged branches unless -v is given).
>=20
> Among the issues that were not sorted out last time:
>=20
>   - should stale branches be shown without -v?

  I believe so, it's valuable information. It's as valuable as what you
get after a git fetch nowadays (like branches have diverged n and m
commits each or similar) But oh well=E2=80=A6 I don't care that much.

quoted text
>   - calling ref_newer here is inefficient, since we have already called
>     it in the other direction. We should probably do the traversal once
>     in such a way as to find out which ref is newer (or if it is
>     indeterminate).

  Well, true, though I don't expect people to have tons of local
branches that match a refspec _and_ lag behind. I suspect this is a very
minor performance loss.

quoted text
>   - there is a possible danger with "git push -f", in that you force
>     both rejected branches as well as stale branches. Junio and I
>     discussed the possibility of disallowing "-f" unless the user
>     explicitly requested _what_ to push; i.e., --all, --matching,
>     --mirror, or a refspec. See:
>=20
>       http://thread.gmane.org/gmane.comp.version-control.git/74425/focus=
=3D74481

  Well afaict this is a separate issue, as we're (with such a patch)
only changing what gets printed on the console, not the internal
behavior. So solving this second issue should not really be a
precondition to the inclusion of such a patch.

quoted text
> I was considering resurrecting my patch after working up that safety
> valve.

  Please please please do :)
  The exit 1 of git-push is really annoying me these days.

--=20
=C2=B7O=C2=B7  Pierre Habouzit
=C2=B7=C2=B7O                                                madcoder@debia=
n.org
OOO                                                http://www.madism.org