On Fri, Feb 02, 2007 at 11:25:28PM +0000, Catalin Marinas wrote:
> OK, tried again and 'stg pull' doesn't update the base with the last
> patch in the series ('stg rebase origin' updates it). I don't have
> anything set up in my gitconfig in this area.
So now that this particular problem has a fix, let's fix everything
related.
Since branch.*.merge accept local ref names, there is probably far
more to change that what I initially feared.
1. I guess we can continue to store local refs for those branches when
they mirror a remote one, but if we store something there without
storing a branch.*.remote to '.', git-fetch could confuse this local
ref with a ref from remote 'origin', since that's still the default.
2. branch.*.merge is not where we should read a parent branch from.
Even if we store that info there, the user could have put a remote ref
name there. So if we want to keep a get_parent_branch() method we'll
have to store that info somewhere else, eg. branch.*.stgit.parentbranch.
3. we need get_parent_branch() to implement parent branch as default
arg to "stg rebase"
So (please correct me if necessary):
- always store local parent branch to branch.*.stgit.parentbranch
- never set branch.*.merge without setting branch.*.remote
- set them, with remote as '.' when dealing with local branch
Best regards,
--
Yann.
-
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