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

Junio C Hamano
2006-03-22T21:32:54Z

Linus Torvalds <torvalds@osdl.org> writes:

> 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

It would be more like

$ dd if=/dev/urandom of=Makefile count=2
$ git commit Makefile
$ git checkout HEAD^ Makefile
$ git commit Makefile

> and then asking me to pull from the result.

... because the point is that the end-result tree being what is
desired is not the only thing that matters, but the history to
get there should not have unnecessary garbage.

I am curious how you found it initially. After you pulled but
before you did further work on top of the updated HEAD, I am
suspecting that there is some sanity check done by you to detect
that you pulled a faulty tree and decide to discard the merge.
It might help to share that with your subsystem maintainers, so
that they can do the same when merging from their feeders.