On 30/11/06, Yann Dirson <ydirson@xxxxxxxxxx> wrote:
I have started to work on recording parent information for stgit branches, so we don't need to give the same info on every "git pull".
Isn't this what the branch.<name>.remote configuration option is for? I think we should leave GIT handle this and StGIT only invoke "git pull" without any arguments.
I'm facing a problem, in that we have several kind of stgit branches: * those created against a cogito branch (eg. by "cg clone" and "stg init"). They work pretty much intuitively (and it happens I mostly used this flavour before those tests). All we need is the name of the local branch, and "stg pull <branch>" relies on "git fetch" to find the repository information in .git/branches/<branch>.
But I think .git/branches got deprecated or it is a cogito-only feature.
In this case, it is easy to request pulling from any branch, but usually only one of them is what you want, and the results of using another one (or forgetting to specify the one you want) can be annoying [ISSUE 1]. Hence this work of mine: being able to store this info in .git/patches/<stack>/parent (my initial implementation) was sufficient in theory.
I would leave this to GIT and its configuration files. Do you see any problems with this approach? I plan to merge the stgit config with the git one (and have a [stgit] section) so that it is more maintainable. -- 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