diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2005-09-30 23:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-30 23:52:48 -0700 |
| commit | 1fea629f794cda57cc161979dab903ec7460cc7c (patch) | |
| tree | d2ceb2e65f686561ec679891cc82272e4cccfd2c /git-merge-one-file.sh | |
| parent | 88cd621deedd2aab8f0a4c6ea3afed7269e66d0c (diff) | |
| download | git-1fea629f794cda57cc161979dab903ec7460cc7c.tar.gz | |
[PATCH] Flag empty patches as errors
A patch that contains no actual diff, and that doesn't change any
meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't
just accept it.
This caused a corrupted patch to be silently applied as an empty change in
the kernel, because the corruption ended up making the patch look empty.
An example of such a patch is one that contains the patch header, but
where the initial fragment header (the "@@ -nr,.." line) is missing,
causing us to not parse any fragments.
The real "patch" program will also flag such patches as bad, with the
message
patch: **** Only garbage was found in the patch input.
and we should do likewise.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions