From 82ddbdf252448bb0e759bfe691f54645ca62ce7a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 3 Jul 2009 00:40:49 +0200 Subject: [PATCH] Fix small mistake. --- ChangeLog | 5 +++++ lib/git-merge-changelog.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3919830a9..43125e06a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-07-02 Bruno Haible + * lib/git-merge-changelog.c (compute_mapping): Fix determination of + best_i. + +2009-07-02 Bruno Haible + Speed up approximate search for matching ChangeLog entries. * lib/git-merge-changelog.c (entry_fstrcmp): Add a lower_bound argument. Call fstrcmp_bounded instead of fstrcmp. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 986b8c832..dadbd9185 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -1,5 +1,5 @@ /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files. - Copyright (C) 2008 Bruno Haible + Copyright (C) 2008-2009 Bruno Haible This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -438,7 +438,7 @@ compute_mapping (struct changelog_file *file1, struct changelog_file *file2, best_i_similarity); if (similarity > best_i_similarity) { - best_i = i; + best_i = ii; best_i_similarity = similarity; } } -- 2.11.0