lkml.org 
[lkml]   [2007]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: My kernel hangs again: Help with git please
On Fri, Jun 15, 2007 at 08:33:38PM -0400, Daniel Barkalow wrote:
> HEAD doesn't mean what you think it means. It's the latest revision on the
> branch with the *. What you want is:
>
> $ git checkout master
>
> This will move the * to "master", which shouldn't have been affected by
> any of this, and move your working directory to this point as well. At
> that point, you should be able to build a working kernel.
>
> What "git reset --hard HEAD" does is discard any differences to tracked
> files between your working directory and the revision you're on. It's
> relevant if you want to discard local changes, not otherwise.

I don't understand - any branch that I am on has many tags. I can use
'git reset --hard sometag' to change the source tree to that tag (which
works if I look at the version in the Makefile and pick tags that are
far apart enough). Then, shouldn't 'HEAD' have the meaning: the newest
tag on the branch? I was on the 'bisect' branch - but that is a copy
of the master, no? At least, that was what I started on when I started
the bisect.

Anyway, I tried this:

$ git checkout master
$ git branch
bisect
* master
origin
$ BRANCH=$(git branch | grep "^\*" | sed -e "s/\* //")
$ echo $BRANCH
master
$ git rev-list --max-count=1 $BRANCH
5ecd3100e695228ac5e0ce0e325e252c0f11806f
Is it correct that this last command gives me the 'git id' (if that
is the correct name for the hash) of the revision that my local
working copy is at?

Can you tell me what is the latest git id that you see?

Because, if I compile 5ecd3100e695228ac5e0ce0e325e252c0f11806f is
still hangs at boot :(

I really don't know how I got a working kernel before :/

--
Carlo Wood <carlo@alinoe.com>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-06-16 06:11    [from the cache]
©2003-2011 Jasper Spaans