At http://people.samba.org/bzr/jelmer/bzr-git/trunk
------------------------------------------------------------
revno: 116
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Tue 2008-11-25 04:58:36 +0100
message:
Merge fix to use active branch.
modified:
dir.py git_dir.py-20071108234408-ygidvy5hviixghsd-1
------------------------------------------------------------
revno: 110.3.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Eric Anderson <[EMAIL PROTECTED]>
branch nick: git
timestamp: Mon 2008-11-24 20:45:22 -0500
message:
When reading branch use active branch instead of first branch.
This allows us to interact with whatever is set as the current active
branch instead of being limited to only the first branch (master).
Useful for creating a branch from somewhere other than master.
Limited in its usefulness as I believe git only allows switching
branches in a non-bare repositories and most trees being branched from
are bare repositories. Also requiring the source repository to switch
its active branch is pretty intrusive. But something is better than
nothing.
modified:
dir.py
git_dir.py-20071108234408-ygidvy5hviixghsd-1
=== modified file 'dir.py'
--- a/dir.py 2008-09-06 13:42:22 +0000
+++ b/dir.py 2008-11-25 01:45:22 +0000
@@ -97,7 +97,7 @@
if repo._git.heads == []:
head = None
else:
- head = repo._git.heads[0].commit.id
+ head = filter(lambda h: h.name == repo._git.active_branch,
repo._git.heads)[0].commit.id
return branch.GitBranch(self, repo, head,
self.root_transport.base, self._lockfiles)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
