From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Jakub Narebski" <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG] StGit removed git branch of the same name as StGit branch
Date: Tue, 21 Nov 2006 09:26:52 +0000 [thread overview]
Message-ID: <b0943d9e0611210126x493848d9xae006af835fc62c7@mail.gmail.com> (raw)
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/.
> 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".
--
next prev parent reply other threads:[~2006-11-21 9:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-20 21:01 [BUG] StGit removed git branch of the same name as StGit branch Jakub Narebski
2006-11-20 21:08 ` Junio C Hamano
2006-11-20 22:28 ` J. Bruce Fields
2006-11-20 22:37 ` Jakub Narebski
2006-11-20 22:48 ` J. Bruce Fields
2006-11-20 22:57 ` Jakub Narebski
2006-11-20 23:53 ` Carl Worth
2006-11-21 10:06 ` Catalin Marinas
2006-11-21 10:56 ` Karl Hasselström
2006-11-21 9:26 ` Catalin Marinas [this message]
2006-11-21 10:07 ` Jakub Narebski
2006-11-21 10:19 ` Catalin Marinas
2006-11-21 10:48 ` Jakub Narebski
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=b0943d9e0611210126x493848d9xae006af835fc62c7@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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).