git-import-dscs creates merges instead of simple commits

[Rolf Leggewie]

Binary package hint: git-buildpackage

I've rebuilt 0.5.4 with 88afa6117ea4dd6b5d8fd88936afffb11c25ec47 reverted ("Pass --multimaint-merge on to dch"). The devscripts package in lucid is not recent enough. As of today, I'm (still) having the following issue with git-import-dsc(s).

TEST CASE:
$ cd /tmp
$ dget -ud http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704-3.
$ for i in 1 2 3 4 ; do dget -ud http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704+dfsg.1-$i.dsc;done
$ git-import-dsc isdnutils_3.9.20060704-3.6.dsc
$ cd isdnutils
$ git branch dfsg upstream
$ git-import-dscs ../isdnutils_3.9.20060704+dfsg.1*dsc --upstream-branch=dfsg #-> bug 615211
$ git log -p

If you look at the history with "git log -p" or qgit you will realize that git-import-dsc uses merges from the upstream branch and HEAD every (!) time instead of just a simple commit when possible. This results in an overly complex history and breaks "git log -p".

[Guido Günther (agx)]

On Mon, Sep 13, 2010 at 06:43:25AM -0000, Rolf Leggewie wrote:
> Public bug reported:
>
> Binary package hint: git-buildpackage
>
> I've rebuilt 0.5.4 with 88afa6117ea4dd6b5d8fd88936afffb11c25ec47
> reverted ("Pass --multimaint-merge on to dch"). The devscripts package
> in lucid is not recent enough. As of today, I'm (still) having the
> following issue with git-import-dsc(s).
>
> TEST CASE:
> $ cd /tmp
> $ for i in 1 2 3 4 ; do dget -ud http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704+dfsg.1-$i.dsc;done
> $ git-import-dscs isdnutils_3.9.20060704+dfsg.1*dsc
> $ cd isdnutils
> $ git log -p
>
> If you look at the history with "git log -p" or qgit you will realize
> that git-import-dsc uses merges from the upstream branch and HEAD every
> (!) time instead of just a simple commit when possible. This results in
> an overly complex history and breaks "git log -p".
>
> ** Affects: git-buildpackage (Ubuntu)
> Importance: Undecided
> Status: New
>
> ** Description changed:
>
> Binary package hint: git-buildpackage
>
> I've rebuilt 0.5.4 with 88afa6117ea4dd6b5d8fd88936afffb11c25ec47
> reverted ("Pass --multimaint-merge on to dch"). The devscripts package
> in lucid is not recent enough. As of today, I'm (still) having the
> following issue with git-import-dsc(s).
>
> TEST CASE:
> $ cd /tmp
> $ for i in 1 2 3 4 ; do dget -ud http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704+dfsg.1-$i.dsc;done
> - $ git-import-dscs
> $ git-import-dscs isdnutils_3.9.20060704+dfsg.1*dsc
> $ cd isdnutils
> $ git log -p
>
> If you look at the history with "git log -p" or qgit you will realize
> that git-import-dsc uses merges from the upstream branch and HEAD every
> (!) time instead of just a simple commit when possible. This results in
> an overly complex history and breaks "git log -p".
This has in fact be fixed in 0.5.4. When not importing a new upstream
version only one parent is set.
 -- Guido

[Rolf Leggewie (r0lf)]

looks like you are right, I was still on 0.5.3 (which was a straight backport to lucid) when I ran into this. I suppose the commit in question would be http://git.debian.org/?p=users/agx/git-buildpackage.git;a=commit;h=f63c4ed85ca16a6869cf35bc9070e3c28163594e I'll see if I can cherry-pick that to backport that to lucid officially.

Closing the ticket for maverick and adding lucid-task.

[Rolf Leggewie (r0lf)]

unfortunately, f63c4ed85ca16a6869cf35bc9070e3c28163594e is not a straight-forward cherry-pick against 0.4.65ubuntu1 and I did not feel confident enough to resolve the conflicts.

Personally, I'll just use the backported 0.5.4 version but it would be nice to have a fixed version in lucid, I guess.

[Guido Günther (agx)]

On Mon, Sep 13, 2010 at 10:02:52AM -0000, Rolf Leggewie wrote:
> unfortunately, f63c4ed85ca16a6869cf35bc9070e3c28163594e is not a
> straight-forward cherry-pick against 0.4.65ubuntu1 and I did not feel
> confident enough to resolve the conflicts.
>
> Personally, I'll just use the backported 0.5.4 version but it would be
> nice to have a fixed version in lucid, I guess.
Thats mostly up to Ubuntu - not much I can do here.
 -- Guido

[Rolf Leggewie (r0lf)]

On 13.09.2010 20:22, Guido Günther wrote:
>> Personally, I'll just use the backported 0.5.4 version but it would be
>> nice to have a fixed version in lucid, I guess.

> Thats mostly up to Ubuntu - not much I can do here.

Sure.