Merge lp:~jelmer/bzr-git/fix-dulwich-compat into lp:bzr-git

[Jelmer Vernooij]

Trivial fix for bzr-git from pitti when used with newer versions of Dulwich.

[Richard Wilbur (richard-wilbur)]

Good fix! Thanks for cleaning up the test failures, Martin.
+1

review: Approve

[Jelmer Vernooij (jelmer)]

On Sun, Jan 19, 2014 at 04:28:37PM -0000, Richard Wilbur wrote:
> Review: Approve
>
> Good fix! Thanks for cleaning up the test failures, Martin.
> +1

Can you please merge this? I'm no longer in the right groups, I think.

[Richard Wilbur (richard-wilbur)]

@Jelmer: Happy to oblige. Thanks for your work to keep bzr-git alive.

[Richard Wilbur (richard-wilbur)]

@Jelmer: What should we update the bug status to in Launchpad LP:
#1270075 -- "Fix Committed" or "Fix Released"? Seems we could safely
claim the fix has been committed--it's on trunk after all. At what
point do we change to "Fix Released", when we make a bzr-git release
containing the fix?

[Jelmer Vernooij (jelmer)]

On Mon, Jan 20, 2014 at 03:15:32PM -0000, Richard Wilbur wrote:
> @Jelmer: What should we update the bug status to in Launchpad LP:
> #1270075 -- "Fix Committed" or "Fix Released"? Seems we could safely
> claim the fix has been committed--it's on trunk after all. At what
> point do we change to "Fix Released", when we make a bzr-git release
> containing the fix?
yeah, that's what I've always done in the past.

That policy is by no means set in stone though. Whoever is actually
doing the work should decide what works best for them.

Cheers,

Jelmer

=== modified file 'branch.py'
--- branch.py	2012-07-02 19:02:08 +0000
+++ branch.py	2014-01-18 17:13:09 +0000
@@ -555,7 +555,7 @@
 
     def _get_head(self):
         try:
-            return self.repository._git.ref(self.ref or "HEAD")
+            return self.repository._git.refs[self.ref or "HEAD"]
         except KeyError:
             return None