git-import-dsc merges to master despite --debian-branch

[Rolf Leggewie]

Binary package hint: git-buildpackage

git-import-dsc will merge to master even when --debian-branch is explicitly set. Run the attached script as a test-case.

[Guido Günther (agx)]

On Mon, Sep 13, 2010 at 03:41:13PM -0000, Launchpad Bug Tracker wrote:
> You have been subscribed to a public bug by Rolf Leggewie (r0lf):
>
> Binary package hint: git-buildpackage
>
> git-import-dsc will merge to master even when --debian-branch is
> explicitly set. Run the attached script as a test-case.

Attached patch should fix this.
 -- Guido

[Guido Günther (agx)]

On Mon, Sep 13, 2010 at 03:41:13PM -0000, Launchpad Bug Tracker wrote:
> You have been subscribed to a public bug by Rolf Leggewie (r0lf):
>
> Binary package hint: git-buildpackage
>
> git-import-dsc will merge to master even when --debian-branch is
> explicitly set. Run the attached script as a test-case.
I've pushed the fix to git. Thanks for the testcase.
 -- Guido

[Rolf Leggewie (r0lf)]

Thank you very much.

[Rolf Leggewie (r0lf)]

Are you planning to make another release to experimental anytime soon? I guess rather than backporting the fix to maverick I'd prefer to sync. Once Maverick has the fix, I'll seek an SRU exception for lucid.

[Guido Günther (agx)]

On Tue, Sep 14, 2010 at 02:52:09AM -0000, Rolf Leggewie wrote:
> Are you planning to make another release to experimental anytime soon?
> I guess rather than backporting the fix to maverick I'd prefer to sync.
> Once Maverick has the fix, I'll seek an SRU exception for lucid.
No, not that soon. I have some other stuff pending which I need to
finish first and Squeeze eats up the little free time I have a at the
momene.

BTW. I've comitted a better fix for this issue which avoids the
unnecessary branch switch.
 -- Guido

[Guido Günther (agx)]

This is fixed in 0.5.9

[Rolf Leggewie (r0lf)]

Guido, that's great news. Thank you very much. I shall request syncing the latest release for Maverick.

[Rolf Leggewie (r0lf)]

0.5.9 has been in Maverick for about three weeks, it seems. I shall try to verify the fix in the next days.

[Rolf Leggewie (r0lf)]

Is this the same problem as

"cd /tmp && mkdir capifax && wget wget http://capifax.v3v.de/dl/capifax-0.7.3.tar.bz2 && cd capifax && git init && git-import-orig --pristine-tar --no-merge ../capifax-0.7.3.tar.bz2" which still creates the master branch and merges to it despite the call not to do so?

[Guido Günther (agx)]

On Sat, Oct 30, 2010 at 09:19:23PM -0000, Rolf Leggewie wrote:
> Is this the same problem as
>
> "cd /tmp && mkdir capifax && wget wget
> http://capifax.v3v.de/dl/capifax-0.7.3.tar.bz2 && cd capifax && git init
> && git-import-orig --pristine-tar --no-merge ../capifax-0.7.3.tar.bz2"
> which still creates the master branch and merges to it despite the call
> not to do so?
Nope. This is unrelated. In fact the issue from above is not a bug since
the _inital_ import always goes to master (the upstream branch is then
created from there). Everything else would pretty much break what's
expected from a git repo.
Cheers,
 -- Guido