diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-28 12:21:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-28 12:21:17 -0700 |
| commit | ab9f30fd7538ec5385bf5a3d11117f23f4f320ee (patch) | |
| tree | 9aadfdafdf71a8e95d79da702e0841790719161f | |
| parent | Teach git-apply about '-R' (diff) | |
| download | tgif-ab9f30fd7538ec5385bf5a3d11117f23f4f320ee.tar.xz | |
git-apply -R: binary patches are irreversible for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-apply.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 6b38a8ad0d..d4381d9a8f 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1535,6 +1535,12 @@ static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch) void *data; void *result; + /* Binary patch is irreversible */ + if (patch->is_reverse) + return error("cannot reverse-apply a binary patch to '%s'", + patch->new_name + ? patch->new_name : patch->old_name); + data = inflate_it(fragment->patch, fragment->size, patch->deflate_origlen); if (!data) |