Browse Source

diff.c: make binary patch reversible.

This matches the format previous "git-apply --reverse" update
expects.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
d4c452f03b
  1. 10
      diff.c

10
diff.c

@ -838,7 +838,7 @@ static unsigned char *deflate_it(char *data, @@ -838,7 +838,7 @@ static unsigned char *deflate_it(char *data,
return deflated;
}

static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
static void emit_binary_diff_body(mmfile_t *one, mmfile_t *two)
{
void *cp;
void *delta;
@ -849,7 +849,6 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two) @@ -849,7 +849,6 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
unsigned long deflate_size;
unsigned long data_size;

printf("GIT binary patch\n");
/* We could do deflated delta, or we could do just deflated two,
* whichever is smaller.
*/
@ -898,6 +897,13 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two) @@ -898,6 +897,13 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
free(data);
}

static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
{
printf("GIT binary patch\n");
emit_binary_diff_body(one, two);
emit_binary_diff_body(two, one);
}

#define FIRST_FEW_BYTES 8000
static int mmfile_is_binary(mmfile_t *mf)
{

Loading…
Cancel
Save