git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Pierre Habouzit <madcoder@debian.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] git-send-pack: don't consider branch lagging behind as errors.
Date: Thu, 19 Jun 2008 09:37:48 -0400	[thread overview]
Message-ID: <20080619133747.GA31209@sigill.intra.peff.net> (raw)
In-Reply-To: <1213872715-11182-1-git-send-email-madcoder@debian.org>

On Thu, Jun 19, 2008 at 12:51:55PM +0200, Pierre Habouzit wrote:

> It's really painful to have git push error out when it's just that one of
> your tracking branches isn't up to date with respect to a remote branch.
> 
> Let just add a new status: "lagging", always print it to screen when we're
> lagging, but don't exit with a non 0 value, as it really alarms users.

This has been discussed before, and the suggested term was "stale".

Check out:

  http://thread.gmane.org/gmane.comp.version-control.git/73038/focus=73186

which is uncannily identical (the difference is the name, and that I
don't show the lagged branches unless -v is given).

Among the issues that were not sorted out last time:

  - should stale branches be shown without -v?

  - 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).

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

      http://thread.gmane.org/gmane.comp.version-control.git/74425/focus=74481

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

-Peff

  reply	other threads:[~2008-06-19 13:39 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19 10:51 [PATCH] git-send-pack: don't consider branch lagging behind as errors Pierre Habouzit
2008-06-19 13:37 ` Jeff King [this message]
2008-06-19 13:52   ` Pierre Habouzit
2008-06-19 15:11     ` Jeff King
2008-06-19 16:28       ` Pierre Habouzit
2008-06-19 18:33         ` Junio C Hamano
2008-06-20  9:55           ` Pierre Habouzit
2008-06-20 22:14         ` しらいしななこ
2008-06-26  7:50       ` Jeff King
2008-06-26  8:19         ` Junio C Hamano
2008-06-26 13:28           ` Pierre Habouzit
2008-06-28  4:33           ` Jeff King
2008-06-28  4:34             ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080619133747.GA31209@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=madcoder@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).