Comment 2 for bug 1702960

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Just came by "this need" as well and wanted to ack and +1 on the prio/need.

We had a case where reviewing https://code.launchpad.net/~ahasenack/ubuntu/+source/bind9/+git/bind9/+merge/329548 with "a classic" checkout as e.g. described on the page ends up dirty.
That is confusing at best.
I'd think that a git ubuntu review could do all that as Nish outlined.
Making the full tree available (for comparison and history), fetching the MP and checking it out while considering all quirks needed.

[15:21] <andreas> cpaelzer: how can a git clone checkout be dirty from the start?
[15:21] <andreas> I got the same, btw
[15:21] <andreas> http://pastebin.ubuntu.com/25472136/
[15:22] <cpaelzer> andreas: that surpasses my git-foo as well for now
[15:22] <andreas> rbasak: do you know? ^
[15:23] <rbasak> andreas: any .gitattributes files?
[15:24] <andreas> maybe, those files all end with ^M$
[15:24] <andreas> $ cat .gitattributes
[15:24] <andreas> *.vcxproj.in eol=crlf
[15:24] <andreas> :/
[15:24] <andreas> so what now?
[15:24] <rbasak> git ubuntu clone is supposed to work around that IIRC.
[15:24] <andreas> rbasak: it does it seems, this happens when you git clone
[15:25] <rbasak> You can look up what it does.
[15:25] <andreas> following the launcphad instructions when you visit a page like https://code.launchpad.net/~ahasenack/ubuntu/+source/bind9/+git/bind9/+ref/artful-bind9-merge-9.10.3.dfsg.P4-12.6
[15:25] <rbasak> I think it puts an override in .git/info/gitattributes or something like that
[15:25] <rbasak> $ cat .git/info/attributes
[15:25] <rbasak> * -ident
[15:25] <rbasak> * -text
[15:25] <rbasak> * -eol
[15:26] <andreas> I have that in the git ubuntu clone
[15:27] <andreas> rbasak: do cpaelzer or I need to do something about this? He was reviewing, and used git glone and saw this huge diff
[15:27] <rbasak> This is why we have git ubuntu clone.
[15:27] <rbasak> We had to wrap it to avoid problems like this.
[15:28] <cpaelzer> I never used it for the reviews actually
[15:28] <cpaelzer> do we have that wrapped into the git ubuntu cli already?
[15:29] <rbasak> You could "git ubuntu clone bind9" and then "git fetch ..." and then examine FETCH_HEAD.
[15:29] <cpaelzer> or TL;DR what would be the (better) command to use to fetch the MP for review - if possible along all of bind9 in USDI anyway
[15:29] <rbasak> Or "git ubuntu remote add ahasenack" and then "git fetch ahasenack <branch name>" IIRC.
[15:29] <cpaelzer> ah yeah I remember using the remote add
[15:29] <cpaelzer> and in general that is close to what I'd want to do
[15:29] <rbasak> Perhaps we should make it so that you can "git ubuntu clone <MP URL>"
[15:30] <cpaelzer> that would be nice
[15:30] <cpaelzer> or even
[15:30] <cpaelzer> git ubuntu review MP
[15:30] <rbasak> Please file bugs.
[15:30] <cpaelzer> making it a clone + MP fetch, checking out the MP

Well the bug exists already so bump+1 here.