On Mon, Apr 01, 2013 at 04:07:56PM +0200, Anatolij Gustschin wrote:
Hello,
On Mon, 1 Apr 2013 09:16:06 -0400 Michael Cashwell mboards@prograde.net wrote:
Greetings,
My u-boot work area got messed up recently when I pulled from master. I'm having trouble figuring out what's wrong.
I have this banner "U-Boot SPL 2013.04-rc1-00024-ga268170-dirty (Mar 15 2013 - 10:24:41)" from a recently working state. A corresponding banner that's broken for me is "U-Boot SPL 2013.04-rc1-00292-g417c558-dirty (Apr 01 2013 - 08:10:25)"
Note that in both of these cases "-dirty" means that you have uncommitted local changes.
I'd like to go through and methodically compare these two but I can't figure out what git command would rewind the work area back to a state that corresponds to a known u-boot banner.
I assume the key bits are "00024-ga268170" but I expect I need a commit ID or branch name and that doesn't seem to be either.
Any pointers?
Commit ID is "a268170" (remove 'g'), with 24 new patches committed after v2013.04-rc1 tag. So
git checkout -b working-state a268170
should work.
And to try and track things do you can do: $ git stash save "My changes to do..." $ git bisect start $ git bisect good a268170 $ git bisect bad
And then 'git bisect good' or 'git bisect bad' as a particular revision works or fails. If you need the local changes to boot your platform, you can do a git stash pop to apply your local changes on top of the new rev, build, git stash save (without a "describe the changes string" git stash still saves your changes, it just doesn't have a helpful a month later string telling you what you did, just what rev you have stashed changes on top of).