Re: [PATCH] cg-pull to stop treating "master" specially, fix fetch_local for .git/HEAD

From: Josef Weidendorfer <josef.weidendorfer@gmx.de>
Date: Nov 11, 2005, 16:10 UTC
Message-ID: <200511111710.21984.Josef.Weidendorfer@gmx.de>
In-Reply-To: <1131722791.1284.20.camel@dv>

On Friday 11 November 2005 16:26, Pavel Roskin wrote:

Show 6 quoted lines

> > AFAIK, there is not really a "new" and "old" style, but more the
> > git way (attributes for remote repositories in .git/remotes) and the
> > Cogito way (attributes for a remote branch).
> 
> Switching to the "git way" is long overdue, since hashes can be used in
> the actual path.

Currently, Git does not store mappings of remote to local branches in .git/remotes/ per se. "Pull" lines allow you to specify default actions for git-fetch/git-pull, but even this is quite limited: "git-fetch" defaults to fetching all heads mentioned, and "git-pull" defaults to merging the first head on the first "Pull" line.

Because the git way is per-remote-repository, you always have to specify the remote repository shortcut in git-fetch/git-pull/git-push, as there is no implicit remote repository. With per-branch, it is far simpler as you always have a current active branch which is HEAD. By using .git/remotes, you more or less get a shortcut name for a remote repository. Of course, Cogito could use this shortcut in the .git/branches/, too.

Another thing: Per branch configuration is not only about branches which have a mapping to a remote file. I would *love* to be able to specify merge candidates and default merge branches for every local branch. Such configuration of local branches can also reside in .git/branches.

But you are right, hashes can be part of an path, so Cogito should use multiple lines in .git/branches/ like Git does in .git/remotes.

So what are possible configuration items for a branch? Branches can be of 2 kinds: either a branch should track a remote branch, or it is used for local development.

A branch which is tracking a remote one does need
* the remote repository URL, or path (if local)
* the branch name to track from the remote repository

A branch used for development can have:
* set of local branch names which are candidates for merging
* set of local branch names for default merge action
* a default remote branch to use for pushing

Show 13 quoted lines

> > For cg-clone, this is no problem because cg-clone writes this file itself.
> > Another thing is if you add later on a remote branch with cg-branch-add
> > without specifying a concrete remote branch name. Do we want the
> > record the branch name at the first cg-fetch for the future?
> 
> Good that you noticed that.
> 
> cg-fetch could do that, but maybe cg-branch-add would be an even better
> place for that?  I mean, cg-branch-add could actually check the
> repository and prompt the user which branch to use if there is no
> obvious default.  I think, there should be a way to run cg-branch-add
> without having it connect the repository or prompt the user, but the
> default should be user-friendly.

Yes.

Josef