Dear Wolfgang, On Thu, 11 Dec 2008 21:54:13 +0100, Wolfgang Denk wd@denx.de wrote:
In message op.ul0bvrx72rocvy@tomo.bln.innominate.local you wrote:
What exactly do you expect this command to do?
You showed us a sequence of two commands: git-clone followed by git-rebase, and complain that it doesn't wor as expected.
You are missing something - either, you miss to describe some additional steps you did between these two commands (in which case we have no chance to comment at all), or you miss how git works.
Sorry if I failed to give a clear explanation, I'll try again.
1) Lets say this is a simplified part of the commit log after I cloned the repo and created my branch with "git checkout -b bisect v2008.10"
tag_v1.3.3 commitA commitB commitC tag_v2008.10
2) then I commit my own patches at the top with "git am 0001-myPatch1.patch 0002-myPatch2.patch"
tag_v1.3.3 commitA commitB commitC tag_v2008.10 myPatch1 myPatch2
3) then I try to "git rebase -i v1.3.3" to reorder the commits in my branch in the following way (which failed):
tag_v1.3.3 commitA myPatch1 commitB myPatch2 commitC tag_v2008.10
4) After that I wanted to do a git bisect between tag_v1.3.3 and tag_v2008.10 to find the commit when my port stops working.
If you have a patchset against v1.3.3, my approach would be to create a branch, for example like this:
git-checkout -b my-test-branch v1.3.3
then apply the patches, commit these, and then (with "my-test-branch" checked out), you could try a "git-rebase -i master".
I see, this would move my patches from after tag_v1.3.3 up to HEAD, but what I tried to accomplish was to distribute them back in the timeline to make bisect work at each point between v1.3.3 and v2008.10.
Lets say there is the commit
commit 0e8d158664a913392cb01fb11a948d83f72e105e Author: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com Date: Wed Sep 10 22:48:06 2008 +0200
rename CFG_ENV macros to CONFIG_ENV
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
and I have a patch "rename_CFG_ENV_to_CONFIG_ENV_myBoard.patch", so I would like to put it directly after above commit, so u-boot compiles before and after these two patches during the bisect process.
But I already managed to do it using git merge. Thanks for your help and sorry for the confusion :)
Best Regards