Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/diff-color-move-more'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000
(10:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000
(10:30 -0700)
Bugfix.
* sb/diff-color-move-more:
diff: fix --color-moved-ws=allow-indentation-change
diff.c
patch
|
blob
|
history
raw
(from parent 1:
bd3941a
)
diff --git
a/diff.c
b/diff.c
index 71ff247702048f70dbfaec59090132461c70642d..f0c7557b40443da060c3070c602dd03f49b0d689 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-980,8
+980,13
@@
static void pmb_advance_or_null_multi_match(struct diff_options *o,
/* Carry the white space delta forward */
pmb[i]->next_line->wsd = pmb[i]->wsd;
pmb[i] = pmb[i]->next_line;
- } else
+ } else {
+ if (pmb[i]->wsd) {
+ free(pmb[i]->wsd->string);
+ FREE_AND_NULL(pmb[i]->wsd);
+ }
pmb[i] = NULL;
+ }
}
}
@@
-1002,10
+1007,6
@@
static int shrink_potential_moved_blocks(struct moved_entry **pmb,
if (lp < pmb_nr && rp > -1 && lp < rp) {
pmb[lp] = pmb[rp];
- if (pmb[rp]->wsd) {
- free(pmb[rp]->wsd->string);
- FREE_AND_NULL(pmb[rp]->wsd);
- }
pmb[rp] = NULL;
rp--;
lp++;