Sean [off-list ref] wrote:
On Fri, 3 Nov 2006 09:12:32 +0100
Karl Hasselström [off-list ref] wrote:
quoted
I would rather see the default pull source of a branch being
determined by which branch it was branched off of. But this should
mean the same thing in this case. We'd just have to have the heuristic
that default pulls from a remotes/*/* branch causes a fetch, while a
default pull from a local branch does not.
Well, when you create a branch a branch.<branch>.merge entry could be
automatically made so that a merge from the proper place happens.
Yes, definately. For most people I know that use Git the branch
they branched off of is the one they need to pull in on a regular
basis to keep their topic branch current. They rarely pull other
branches in.
But in the absence of any config merge entries, it would be nice to
default to the same branch name from the remote namespace. This
removes the need to create merge entries for the initial clone.
Of course, currently you have to create branch.<branch>.merge
entries by hand.
Nack. I'd rather see the entries added/removed from .git/config when
the branch is created/deleted, just like the ref and the reflog are
created/deleted. It makes behavior more consistent for the user
and it is mostly self documenting...
"why is branch FOO pulling FOO by default? ahhh, its in
.git/config after git branch FOO FOO."
Same goes for git-clone. The branch.master.merge=origin/master
entry should be in .git/config file after the clone is complete.
--
Jeff King [off-list ref] wrote:
On Fri, Nov 03, 2006 at 03:29:45PM -0500, Shawn Pearce wrote:
quoted
Nack. I'd rather see the entries added/removed from .git/config when
the branch is created/deleted, just like the ref and the reflog are
created/deleted. It makes behavior more consistent for the user
and it is mostly self documenting...
If we go this route, please consider updating .git/auto-branch-config or
similar, and adding the functionality to include that file into
.git/config.
I think the concept of automagically munging a user-editable config file
is problematic, especially when users might manage those files with
version control or other systems.
Most users that I know use repo-config to munge their .git/config
rather than editing it by hand. Though with more data stored in
it for branches and remotes that is probably going to change.
If we go this route I wonder if want to say create a config file
per branch and then use a wildcard include like Apache's httpd.conf
wildcard include, e.g.:
.git/config:
include branch_configs/**/*.config
.git/branch_configs/refs/heads/master.config:
[branch "master"]
...
As then git-branch is only manipulating one file per branch.
--
On Fri, Nov 03, 2006 at 03:29:45PM -0500, Shawn Pearce wrote:
Nack. I'd rather see the entries added/removed from .git/config when
the branch is created/deleted, just like the ref and the reflog are
created/deleted. It makes behavior more consistent for the user
and it is mostly self documenting...
If we go this route, please consider updating .git/auto-branch-config or
similar, and adding the functionality to include that file into
.git/config.
I think the concept of automagically munging a user-editable config file
is problematic, especially when users might manage those files with
version control or other systems.
On Fri, 3 Nov 2006 15:29:45 -0500
Shawn Pearce [off-list ref] wrote:
Nack. I'd rather see the entries added/removed from .git/config when
the branch is created/deleted, just like the ref and the reflog are
created/deleted. It makes behavior more consistent for the user
and it is mostly self documenting...
"why is branch FOO pulling FOO by default? ahhh, its in
.git/config after git branch FOO FOO."
Same goes for git-clone. The branch.master.merge=origin/master
entry should be in .git/config file after the clone is complete.
Well that's certainly an alternative implementation that achieves
the same thing. The essential point is that most of the time the
Git user should not have to manually create the merge entries
in the config file. Git should be smart enough to get it right
most of the time automatically.