Merge lp:~jelmer/brz/active-refs-only into lp:brz/3.1

[Jelmer Vernooij]

Only set git refs that we actually fetched.

Only set git refs that we actually fetched.

[Jelmer Vernooij (jelmer)]

review: Approve

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/812/

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/828/

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

Merging failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/830/

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2021-03-24 01:54:08 +0000
+++ breezy/git/dir.py	2021-03-24 04:27:43 +0000
@@ -238,6 +238,7 @@
         from ..repository import InterRepository
         from .mapping import default_mapping
         from ..transport.local import LocalTransport
+        from .refs import is_peeled
         if no_tree:
             format = BareLocalGitControlDirFormat()
         else:
@@ -261,7 +262,10 @@
         (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
                                                        mapping=default_mapping)
         for name, val in viewitems(refs):
-            target_git_repo.refs[name] = val
+            if is_peeled(name):
+                continue
+            if val in target_git_repo.object_store:
+                target_git_repo.refs[name] = val
         result_dir = LocalGitDir(transport, target_git_repo, format)
         result_branch = result_dir.open_branch()
         try: