projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow finding things that begin with a dash in 'git grep'
[git.git]
/
diffcore-break.c
diff --git
a/diffcore-break.c
b/diffcore-break.c
index
9852f97
..
b0c8461
100644
(file)
--- a/
diffcore-break.c
+++ b/
diffcore-break.c
@@
-65,7
+65,7
@@
static int should_break(struct diff_filespec *src,
delta = diff_delta(src->data, src->size,
dst->data, dst->size,
delta = diff_delta(src->data, src->size,
dst->data, dst->size,
- &delta_size,
~0UL
);
+ &delta_size,
0
);
/* Estimate the edit size by interpreting delta. */
if (count_delta(delta, delta_size,
/* Estimate the edit size by interpreting delta. */
if (count_delta(delta, delta_size,
@@
-231,8
+231,8
@@
static void merge_broken(struct diff_filepair *p,
dp = diff_queue(outq, d->one, c->two);
dp->score = p->score;
dp = diff_queue(outq, d->one, c->two);
dp->score = p->score;
- diff_free_filespec
_data
(d->two);
- diff_free_filespec
_data
(c->one);
+ diff_free_filespec(d->two);
+ diff_free_filespec(c->one);
free(d);
free(c);
}
free(d);
free(c);
}