Merge lp:~jelmer/brz/ref-is-dir into lp:brz/3.0

[Jelmer Vernooij]

Don't throw an error attempting to read the parent of a ref.

Don't throw an error attempting to read the parent of a ref.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/77/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/80/

=== modified file 'breezy/git/tests/test_dir.py'
--- breezy/git/tests/test_dir.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_dir.py	2019-12-23 03:05:34 +0000
@@ -53,11 +53,17 @@
         gd = controldir.ControlDir.open('.')
         self.assertIsInstance(gd, dir.LocalGitDir)
 
+    def test_open_ref_parent(self):
+        r = GitRepo.init(".")
+        cid = r.do_commit(message=b"message", ref=b'refs/heads/foo/bar')
+        gd = controldir.ControlDir.open('.')
+        self.assertRaises(errors.NotBranchError, gd.open_branch, 'foo')
+
     def test_open_workingtree(self):
-        GitRepo.init(".")
+        r = GitRepo.init(".")
+        r.do_commit(message=b"message")
 
         gd = controldir.ControlDir.open('.')
-        raise TestSkipped
         wt = gd.open_workingtree()
         self.assertIsInstance(wt, workingtree.GitWorkingTree)
 

=== modified file 'breezy/git/transportgit.py'
--- breezy/git/transportgit.py	2019-02-06 05:44:37 +0000
+++ breezy/git/transportgit.py	2019-12-23 03:05:34 +0000
@@ -211,7 +211,11 @@
         except NoSuchFile:
             return None
         with f:
-            header = f.read(len(SYMREF))
+            try:
+                header = f.read(len(SYMREF))
+            except ReadError:
+                # probably a directory
+                return None
             if header == SYMREF:
                 # Read only the first line
                 return header + next(iter(f)).rstrip(b"\r\n")

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-12-23 00:25:21 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-12-23 03:05:34 +0000
@@ -32,6 +32,9 @@
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
+ * Don't throw an error attempting to read the parent of a ref.
+   (Jelmer Vernooij)
+
  * Fix fast-exporting of symlinks on Python 3. (Jelmer Vernooij, #1851478)
 
  * Don't rely on private transport attribute in fast-import.