git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[StGIT RFC PATCH 0/2] Fixing the rebase safeguard

From
Yann Dirson <ydirson@altern.org>
Date
Jun 3, 2007, 13:41 UTC
Message-ID
<20070603133006.1681.1742.stgit@gandelf.nowhere.earth>

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/>
Next: Yann Dirson
Message 1 of 5 in “Fixing the rebase safeguard”
  1. 0/2 Fixing the rebase safeguardYann Dirson, Jun 3, 2007
  2. 1/2 Changed rebasing safety check to look for reachability of stack base (gna bug #9181).Yann Dirson, Jun 3, 2007
  3. David KågedalJun 4, 2007
  4. 2/2 Test "stg rebase" after "stg commit"Yann Dirson, Jun 3, 2007
  5. Catalin MarinasJun 4, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.