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

Re: stgit: bunch of bugreports/wishes

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jul 5, 2006, 14:29 UTC
Message-ID
<b0943d9e0607050729v75a5e6deq6baff0350b422122@mail.gmail.com>
In-Reply-To
<20060622221425.GA7851@nowhere.earth>
On 22/06/06, Yann Dirson <ydirson@altern.org> wrote:
Show 7 quoted lines
> - "push --undo" is not robust.  On the occasion reproduced below, I
> had to rollback the push myself by hand-modifying the stgit data,
> which took me some effort.  I'll have to gather precise info, but the
> issue occurs on patch reordering, on a genuine conflict, and seems to
> be involve a change to a non-existent file, when that file would have
> been added by a non-applied patch originally below the one I attempted
> to apply.

I fixed this bug and I'll push the changes tonight. It was caused by a "git-diff-index" call with files but without the "--" argument. When the file was actually missing from the repository, git was confused and returned an error. The 'status --reset' command was failing in this situation as well.

-- 
Catalin
Previous: Yann Dirson
Message 4 of 4 in “stgit: bunch of bugreports/wishes”
  1. Yann DirsonJun 22, 2006
  2. Catalin MarinasJun 26, 2006
  3. Yann DirsonAug 14, 2006
  4. Catalin MarinasJul 5, 2006

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.