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

Re: stgit: deleting a branch doesn't seem to work

From
TSTorgil Svensson <torgil.svensson@gmail.com>
Date
Aug 22, 2006, 17:12 UTC
Message-ID
<e7bda7770608221012u269ca577ye83a3a548c4faf08@mail.gmail.com>
In-Reply-To
<tnxd5attbhq.fsf@arm.com>

Which option you choose doesn't really matter to me, I easily deleted the master-branch (with rm). If you choose to stay with the current situation the message should be changed to something like "stgit patches succesfully deleted from branch xxx" and "branch xxx is not controlled by stgit, nothing is done."

It also would be helpful to new users if "stg refresh -e" is mentioned in the tutorial. Refresh isn't obvious to test if you want to edit description.

Otherwise I had no problem in my first stgit experience. I first took a chance that "stgit import" recognized patches saved by "format-patch", but this was easily solved with "stg refresh -e" once I found it (thanks #git).

I've never worked with quilt before so i'm new to this style of development. My experiece so far is that I find stgit to be very useful. Thanks!

//Torgil
On 8/22/06, Catalin Marinas <catalin.marinas@arm.com> wrote:
Show 28 quoted lines
> "Torgil Svensson" <torgil.svensson@gmail.com> wrote:
> > I have three branches and want my "gst10" to be "master" instead
> >
> > $ stg branch --delete master
> > Deleting branch "master"... done
> > $ stg branch -l
> > Available branches:
> >   s     gst10   |
> >         master  |
> >>       origin  |
> > $ stg branch --delete master
> > Deleting branch "master"... done
> > $ stg branch -r gst10 master
> > stg branch: Branch "master" already exists
> >
> > Is there something i'm missing in my logic?
>
> It's not actually documented but it looks like the master branch is
> not completely deleted by StGIT. If you have StGIT-managed patches in
> "master", they are removed but the GIT branch is kept as this is
> usually the default branch.
>
> You could do a "git branch -d master" but maybe I should change StGIT
> to fully delete the "master" branch as well.
>
> --
> Catalin
>
Previous: Catalin MarinasNext: Catalin Marinas
Message 3 of 4 in “stgit: deleting a branch doesn't seem to work”
  1. Torgil SvenssonAug 21, 2006
  2. Catalin MarinasAug 22, 2006
  3. Torgil SvenssonAug 22, 2006
  4. Catalin MarinasAug 23, 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.