Breezy

Merge lp:~jelmer/brz/non-commit-tags into lp:brz

  1. non-commit-tags
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/non-commit-tags
Merge into: lp:brz
Diff against target: 24 lines (+8/-0)
1 file modified
breezy/git/branch.py (+8/-0)
To merge this branch: bzr merge lp:~jelmer/brz/non-commit-tags
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+374398@code.launchpad.net

Commit message

Cope with non-commit tags in remote Git repositories.

Description of the change

Cope with non-commit tags in remote repositories.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/branch.py'
2--- breezy/git/branch.py 2019-08-11 16:27:38 +0000
3+++ breezy/git/branch.py 2019-10-20 02:17:45 +0000
4@@ -158,6 +158,10 @@
5 trace.warning('%s does not point to a valid object',
6 tag_name)
7 continue
8+ except NotCommitError:
9+ trace.warning('%s points to a non-commit object',
10+ tag_name)
11+ continue
12 target_repo._git.refs[ref_name] = unpeeled or peeled
13 else:
14 try:
15@@ -169,6 +173,10 @@
16 trace.warning('%s does not point to a valid object',
17 ref_name)
18 continue
19+ except NotCommitError:
20+ trace.warning('%s points to a non-commit object',
21+ tag_name)
22+ continue
23 conflicts.append((tag_name, source_revid, target_revid))
24 return updates, conflicts
25

Subscribers

People subscribed via source and target branches