Re: git fsck messages - what to do about it?

From: Linus Torvalds <torvalds@osdl.org>
Date: Sep 16, 2005, 18:50 UTC
Message-ID: <Pine.LNX.4.58.0509161140141.26803@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.58.0509161114540.26803@g5.osdl.org>

On Fri, 16 Sep 2005, Linus Torvalds wrote:

Show 7 quoted lines

> 
> > b) Is there any way to find out what I did wrong in the first place?
> 
> Well, it probably isn't even an error, but there are nice tools to check 
> it out. For example, you can just list the commits it lists to gitk, and 
> you'll get a nice graphical view of where they are in the tree. That 
> probably makes you go "Duh, yes, I did a 'git reset' to undo those".

Doing exactly that:

	gitk 08cf4121ad704faa5ae7c7ae7b3dca4476ef2770 \
		8493c04f1b8c9da0c5dc83091cabbcd0b98954ed \
		e1bcd2a5d53bceef2679737474487e32d87e7f2c \
		c1b779fbce762c970e3ace4332bb6ddc0de65e61

says that three of the commits were the same one, redone:

	Added support for mtddevnum and mtddevname variables.

in one form or another (quick look at the diffs says that one was apparently re-done because you forgot the changelog entry, I didn't look any closer).

So I suspect that's you just undoing a commit, and redoing it. I assume that somewhere in the _reachable_ tree is one final commit that actually did that, but I didn't bother to search for it (but that's easy too if you want to:just go "gitk --all" and then search for that "Added support for mtddevnum"...)

The fourth commit is 8493c

	Rebased: Rewrite of NAND code based on what is in 2.6.12 Linux kernel

and considering that you seem to have other undo's in the tree, I'll just assume this is one more, but you would know.

		Linus