Bad merging with stgit or git

From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mar 21, 2006, 19:34 UTC
Message-ID: <1142969653.4749.109.camel@praia>

I have a -git tree that generated a really bad result when committed by Linus, generating a really bad history log. My tree is located at: kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git.

I'll try to make a brief from what's happened:

According to him: " ... In particular, commit e338b736f1aee59b757130ffdc778538b7db18d6 is crap, crap, CRAP. It's "Merging Linus tree", but it's not a merge at all: you have just applied the _patch_ to merge the changes in my tree, but you haven't actually told git to do so.

I don't know how/why you did that, but it's totally bogus, and I refuse to pull from that tree. That's a 5000+ line diff, affecting about 180 files! ... "

After a further analysis, it seemed that a merge conflict were badly solved. It is showing this message to Linus:

diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from
cb31c70cdf1ac7034bed5f83d543f4888c39888a)
        Author:     Mauro Carvalho Chehab <mchehab@infradead.org>
        AuthorDate: Fri Mar 10 01:30:04 2006 -0300
        Commit:     Mauro Carvalho Chehab <mchehab@infradead.org>
        CommitDate: Fri Mar 10 01:30:04 2006 -0300

            Merging Linus tree

        :100644 100644 be5ae600f5337dbb14daa8d4cace110486e14f79
81bc51369f59a413108fd8b150c3090541ba49f8 M
Documentation/feature-removal-schedule.txt
        :100644 100644 75205391b335f85c9b8a599d0d3b4c0dd1a8b41b
fc99075e0af47f0b73a2ae2dfb7d19920c604dea M
Documentation/kernel-parameters.txt
        :100644 100644 9006063e73691da7b68449955a135f7c9317e2cd
da677f829f7689966bf09aeda6d89fc4b6a876d1 M      arch/alpha/kernel/irq.c

For me, those tree last lines, don't appear. Instead, it just shows, with git-show:

diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from
cb31c70cdf1ac7034bed5f83d543f4888c39888a)
Author: Mauro Carvalho Chehab <mchehab@infradead.org>
Date:   Fri Mar 10 01:30:04 2006 -0300

    Merging Linus tree

and a diff file, with:
 179 files changed, 1274 insertions(+), 785 deletions(-)

With git-cat-file, it shows:

$ git-cat-file commit e338b736f1aee59b757130ffdc778538b7db18d6 tree b233a18f740a2883e4863506175f671d821f1e5e parent cb31c70cdf1ac7034bed5f83d543f4888c39888a author Mauro Carvalho Chehab <mchehab@infradead.org> 1141965004 -0300 committer Mauro Carvalho Chehab <mchehab@infradead.org> 1141965004 -0300

Merging Linus tree

It shouldn't have any conflicts here for Linus, since those patches came from his tree.

My current procedure is:

branch origin - Linus tree replica branch work - my stgit main tree branch work-fixes - my stgit tree for bug fixes branch master - patches to current kernel branch devel - patches to next kernel

All patches are generated against work branch, with stgit. Branch work-fixes receives patches by using:

        stg pick <sha>@work

Before commiting to kernel.org, I do:
at origin:
        git pull linus_tree

at master:
        git pull . origin
        git pull . work-fixes

at devel:
        git pull . origin
        git pull . work

My environment is:

Stacked GIT 0.8.1 git version 1.2.4.gfd662 Python version 2.4.2 (#2, Jan 30 2006, 18:33:58) [GCC 4.0.2 (4.0.2-1mdk for Mandriva Linux release 2006.1)]

Any ideas?