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

Re: [BUG] StGit removed git branch of the same name as StGit branch

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Nov 21, 2006, 09:26 UTC
Message-ID
<b0943d9e0611210126x493848d9xae006af835fc62c7@mail.gmail.com>
In-Reply-To
<200611202201.45521.jnareb@gmail.com>
On 20/11/06, Jakub Narebski <jnareb@gmail.com> wrote:
> I have used StGit (wonderfull tool) to manage patches on git branch
> gitweb/web. Unfortunately, I have named stg branch the same as git
> branch.

Well, there is no such thing as a stg branch. StGIT shares the branch structure with GIT and the "branch" command works on the whole GIT branch, with some additional things for handling the patches. Once a GIT branch is StGIT-initialised (either by being created with "stg branch" or by "stg init") it will always remain a StGIT branch and get a reference in refs/bases/.

Show 7 quoted lines
> When removing stg branch (I wanted to remove
> heads/base/gitweb/web) using "stg branch --delete gitweb/web" it
> deleted also git branch when I wanted to remove only the StGit managed
> indicator. Fortunately I was able to recover the branch from reflog, as
> StGit didn't delete reflog with deletion of git branch.
>
> Perhaps that is correct behavior... but certainly unexpected.

I've never thought anyone would see a different meaing for the "branch" command. What you wanted to do was the reverse of the "init" command. Maybe something like "uninit" or a "--uninit" option to "branch".

Previous: Karl HasselströmNext: Jakub Narebski
Message 10 of 13 in “[BUG] StGit removed git branch of the same name as StGit branch”
  1. Jakub NarebskiNov 20, 2006
  2. Junio C HamanoNov 20, 2006
  3. J. Bruce FieldsNov 20, 2006
  4. Jakub NarebskiNov 20, 2006
  5. J. Bruce FieldsNov 20, 2006
  6. Jakub NarebskiNov 20, 2006
  7. Carl WorthNov 20, 2006
  8. Catalin MarinasNov 21, 2006
  9. Karl HasselströmNov 21, 2006
  10. Catalin MarinasNov 21, 2006
  11. Jakub NarebskiNov 21, 2006
  12. Catalin MarinasNov 21, 2006
  13. Jakub NarebskiNov 21, 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.