lkml.org 
[lkml]   [2006]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 000/141] V4L/DVB updates part 1
Date
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.


-
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: 2006-03-22 22:35    [W:0.194 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site