On Sun, 27 Apr 2008 13:24:08 -0700 (PDT) Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> So it depends on what you want.
>
> git diff a...b
>
> says literally "what has been added to 'b' since it diverged from 'a'".
Confounded by Ingo.
origin.patch (generated via git-diff v2.6.25...origin) has:
commit 7f424a8b08c26dc14ac5c17164014539ac9a5c65
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Fri Apr 25 17:39:01 2008 +0200
fix idle (arch, acpi and apm) and lockdep
and git-x86 (generated via git-diff origin...git-x86) has:
commit 0a1679501624482a06c19af49d55b68d3973e2f0
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Fri Apr 25 17:39:01 2008 +0200
fix idle (arch, acpi and apm) and lockdep
which I assume is the same patch as a different commit.
The old `doit':
doit()
{
tree=$1
upstream=$2
cd $GIT_TREE
git reset --hard "$upstream"
git fetch "$tree" || exit 1
git merge --no-commit 'test merge' HEAD FETCH_HEAD > /dev/null
{
git_header "$tree"
git log --no-merges ORIG_HEAD..FETCH_HEAD
git diff --patch-with-stat ORIG_HEAD
} >$PULL/$tree.patch
{
echo DESC
echo $tree.patch
echo EDESC
git_header "$tree"
git log --no-merges ORIG_HEAD..FETCH_HEAD
} >$PULL/$tree.txt
git reset --hard "$upstream"
}
prevented that by doing a merge.
git-diff was "wrong" to claim that this change is actually present in the
origin->git-x86 diff. But I guess it cannot operate at that level and we
need to do the merge to resolve it. Or something.
ho hum.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
