Re: [PATCH 2/3] Handle branch names with slashes

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: May 15, 2006, 10:22 UTC
Message-ID: <b0943d9e0605150322w684785d5n9b17dccda6b29ac1@mail.gmail.com>
In-Reply-To: <20060515095440.GA11412@backpacker.hemma.treskal.com>

Karl,

On 15/05/06, Karl Hasselström <kha@treskal.com> wrote:

> Teach stgit to handle branch names with slashes in them; that is,
> branches living in a subdirectory of .git/refs/heads.

Thanks for the patches. I'll add them, probably tomorrow evening as I'm busy today.

Show 6 quoted lines

> I had to change the patch@branch/top command-line syntax to
> patch@branch#top, in order to get sane parsing. The /top variant is
> still available for repositories that have no slashy branches; it is
> disabled as soon as there exists at least one subdirectory of
> refs/heads. Preferably, this compatibility hack can be killed some
> time in the future.

There is one problem with killing "/" entirely (or maybe we could use other character than "#"). I tend to write quite often "stg diff -r /bottom" to see how the whole patch looks like before refreshing. With "#", the shell ignores "#bottom" as being a comment.

Otherwise, I'm OK with changing "/" with something else or just keeping both (though I prefer to have a singe way of specifying it). It looks like ^ and ~ are already used by GIT. It leaves us with % and !. Do you have any preference? The exclamation mark looks OK to me.

-- 
Catalin