[PATCH v4 3/8] status: Added missing calls to diff_unmodified_pair() in format_callbacks.
- From
Henrik Grubbström (Grubba) <grubba@grubba.org>
- Date
- Apr 6, 2010, 12:46 UTC
- Message-ID
- <5962221bef558d15183c9937863b38bc7ca41339.1270554878.git.grubba@grubba.org>
- In-Reply-To
- <cover.1270554878.git.grubba@grubba.org>
The diff_queue_struct provided by diff_flush() is raw, and needs to be filtered through diff_unmodified_pair() before being used. This is already done by most of the other functions operating on diff_queue_struct called by diff_flush().
Signed-off-by: Henrik Grubbström <grubba@grubba.org> --- For diff_modified_pair() to be able to do its job, it needs to be called...
wt-status.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/wt-status.c b/wt-status.c index 8ca59a2..e661225 100644 --- a/wt-status.c +++ b/wt-status.c @@ -229,6 +229,8 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q, struct wt_status_change_data *d; p = q->queue[i]; + if (diff_unmodified_pair(p)) + continue; it = string_list_insert(p->one->path, &s->change); d = it->util; if (!d) { @@ -276,6 +278,8 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q, struct wt_status_change_data *d; p = q->queue[i]; + if (diff_unmodified_pair(p)) + continue; it = string_list_insert(p->two->path, &s->change); d = it->util; if (!d) {
-- 1.7.0.3.316.g33b5e