On 20/11/06, Jakub Narebski <jnareb@xxxxxxxxx> 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". -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html