/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2019-10-20 02:08:44 UTC
  • mto: This revision was merged to the branch mainline in revision 7406.
  • Revision ID: jelmer@jelmer.uk-20191020020844-rpdqn2ug00vv8srx
Cope with non-commit tags in remote git repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
158
158
                    trace.warning('%s does not point to a valid object',
159
159
                                  tag_name)
160
160
                    continue
 
161
                except NotCommitError:
 
162
                    trace.warning('%s points to a non-commit object',
 
163
                                  tag_name)
 
164
                    continue
161
165
                target_repo._git.refs[ref_name] = unpeeled or peeled
162
166
            else:
163
167
                try:
169
173
                    trace.warning('%s does not point to a valid object',
170
174
                                  ref_name)
171
175
                    continue
 
176
                except NotCommitError:
 
177
                    trace.warning('%s points to a non-commit object',
 
178
                                  tag_name)
 
179
                    continue
172
180
                conflicts.append((tag_name, source_revid, target_revid))
173
181
        return updates, conflicts
174
182