fix-remote-add-changelog-notes : lp:~racb/git-ubuntu : Git : Code : git-ubuntu

Get this branch:: git clone -b fix-remote-add-changelog-notes https://git.launchpad.net/~racb/git-ubuntu

Only Robie Basak can upload to this branch. If you are Robie Basak please log in for upload directions.

Branch merges

Merged into git-ubuntu:master at revision 9804f96758994b20f4cd1e5010c0390d768bef49

Bryce Harrington: Approve on 2020-05-08

Server Team CI bot: Approve (continuous-integration) on 2020-05-06

Branch information

Name:: fix-remote-add-changelog-notes

Repository:: lp:~racb/git-ubuntu

Recent commits

30569f8... by Robie Basak on 2020-05-06

Don't add changelog notes fetch refspec for !pkg

The changelog notes fetch respec should only be added for the main 'pkg'
remote (the "base remote" in the code), as other remotes are not
expected to have these.

This fixes a bug:

$ git ubuntu remote add <anything other than pkg>
fatal: Couldn't find remote ref refs/notes/commits

We don't currently have test coverage for the affected methods, but I
have tried to reduce tech debt somewhat at least by adding docstrings to
clarify intended behaviour.

Thanks to Andreas Hasenack for finding this in the edge channel early.

305b7b2... by Robie Basak on 2020-05-05

version: bump to 0.10

7a60e7f... by Robie Basak on 2020-04-24

Preserve MPs on reimport

When reimporting, instead of deleting a git repository before repushing
it, we can force push all our new refs and ensure that refs not being
pushed get deleted using --prune. This creates the same effect but
allows us to preserve old merge proposals.

There is a possibility that some configuration in the git repository
will be left behind from a previous import. However all configuration
(eg. the HEAD pointer) is reset by the importer on every run, so
everything that the importer touches will get fixed. Anything else can
be considered out of scope for --reimport to achieve.

The default repository for the source package will therefore not be
reset; if it was set to the old repository, it will continue to point to
the "new" one. This is actually what we want, so is fine.

13ad773... by Robie Basak on 2020-05-01