git-ubuntu

Merge ~nacc/git-ubuntu:use-dpkg-mergechangelogs into git-ubuntu:master

  1. Git
  2. lp:~nacc/git-ubuntu
  3. use-dpkg-mergechangelogs
  4. Merge into master
Proposed by Nish Aravamudan
Status: Merged
Merged at revision: 2fe190cc8163d04da5babbc4fda4fa79ca8093cc
Proposed branch: ~nacc/git-ubuntu:use-dpkg-mergechangelogs
Merge into: git-ubuntu:master
Diff against target: 60 lines (+18/-12)
2 files modified
gitubuntu/git_repository.py (+1/-1)
gitubuntu/lint.py (+17/-11)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Review via email: mp+328127@code.launchpad.net

This proposal supersedes a proposal from 2017-07-19.

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote : Posted in a previous version of this proposal

Comments inline.

review: Needs Fixing
Revision history for this message
Nish Aravamudan (nacc) wrote :

I think I addressed all the review comments.

~nacc/git-ubuntu:use-dpkg-mergechangelogs updated
e537604... by Nish Aravamudan

gitubuntu/git_repository: cat-file produces extra blank lines

Revision history for this message
Nish Aravamudan (nacc) wrote :

Hi Robie, I just pushed one additional commit, which I think resolves the issue we discussed on IRC during the sprint, when `git cat-file` emits an extra newline after the file contents.

Revision history for this message
Robie Basak (racb) wrote :

Looks good!

I'm not keen on the clobbering of the work tree, but I think we need to fix that separately.

> gitubuntu/git_repository: cat-file produces extra blank lines

I think the commit summary should be written in the sense of what is being changed, rather than the problem being fixed. Though the problem being fixed is fine to explain the commit description.

So how about: "GitUbuntuRepository: suppress extra cat-file blank lines"

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches