diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xpatience.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c index 76fdb492a..8addd2c36 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 381, +/**/ 380, /**/ 379, diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c index 00af0ff11..2c65aac38 100644 --- a/src/xdiff/xpatience.c +++ b/src/xdiff/xpatience.c @@ -209,11 +209,6 @@ static struct entry *find_longest_common_sequence(struct hashmap *map) struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *)); int longest = 0, i; struct entry *entry; - - /* Added to silence Coverity. */ - if (sequence == NULL) - return map->first; - /* * If not -1, this entry in sequence must never be overridden. * Therefore, overriding entries before this has no effect, so @@ -221,6 +216,10 @@ static struct entry *find_longest_common_sequence(struct hashmap *map) */ int anchor_i = -1; + /* Added to silence Coverity. */ + if (sequence == NULL) + return map->first; + for (entry = map->first; entry; entry = entry->next) { if (!entry->line2 || entry->line2 == NON_UNIQUE) continue; |