git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT RFC PATCH 0/2] Fixing the rebase safeguard
Date: Sun, 03 Jun 2007 15:41:46 +0200	[thread overview]
Message-ID: <20070603133006.1681.1742.stgit@gandelf.nowhere.earth> (raw)

This is an attempt at using a reachability test to replace the use of
orig-base, to decide when it is safe to accept a rebase.

This implementation passes the testcase posted earlier by Karl (resent
here as 2nd patch in this series), BUT fails the 4th test of t2100.
That is, it fails to deal with the case of a rewinding commit occuring
in the upstream branch, and being first git-fetch'd before being
stg-pull'd in fetch-rebase mode.  In this case, the former upstream
commit will really be lost.

In this case, however, it is exactly what we want, but I'm still
undecided about how to deal with this best.  Possibly insane ideas for
now include:

- parsing the remote.*.fetch lines to detect the leading + (just
  kidding ;)
- using ORIG_HEAD, but then, how do we decide when it is valid to do
  so ?

I'll now switch to some real-life activity to see if that helps to
find a better solution.

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>

             reply	other threads:[~2007-06-03 13:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-03 13:41 Yann Dirson [this message]
2007-06-03 13:41 ` [PATCH 1/2] Changed rebasing safety check to look for reachability of stack base (gna bug #9181) Yann Dirson
2007-06-04 13:42   ` David Kågedal
2007-06-03 13:41 ` [PATCH 2/2] Test "stg rebase" after "stg commit" Yann Dirson
2007-06-04 22:41 ` [StGIT RFC PATCH 0/2] Fixing the rebase safeguard Catalin Marinas

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=20070603133006.1681.1742.stgit@gandelf.nowhere.earth \
    --to=ydirson@altern.org \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.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).