Re: [PATCH 000/141] V4L/DVB updates part 1

[Linus Torvalds]

On Tue, 21 Mar 2006, Daniel Barkalow wrote:
> 
> Isn't this what you'd get if you accidentally removed .git/MERGE_HEAD 
> while trying to resolve a merge, and then absent-mindedly described what 
> you'd done in the commit message (forgetting that it ought to have 
> generated the commit message for you in this situation)?

Yes, exactly. But the point is, that if anybody does something like that, 
they should be
 (a) shot
 (b) told that they should never ever do that again

(Not necessarily in that order).

The thing is, the above workflow generates a _buggy_ repository. It will 
be entirely "correct" in the sense that it passes all git self-consistency 
checks, but it's not really any different from doing

	dd if=/dev/urandom of=Makefile count=2
	git commit Makefile

and then asking me to pull from the result. 

> I expect the source of the bad commit is losing that, although I don't 
> know any obvious way to lose it (and still have the index contents which 
> you're merging).

Something like "git reset HEAD" + "git commit" might do it.

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