undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove combine-diff.c::uninteresting()

Browse Source 
A patch from David Rientjes made me realize we do not have to have
this function -- just call diff_unmodified_pair() directly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-08-14 18:36:00 -07:00
parent 968a1d65f4
commit a976b0a593
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
combine-diff.c
View File

@ -7,13 +7,6 @@
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "log-tree.h" #include "log-tree.h"
static int uninteresting(struct diff_filepair *p)
{
if (diff_unmodified_pair(p))
return 1;
return 0;
}
static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent) static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
{ {
struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct *q = &diff_queued_diff;
@ -25,7 +18,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
int len; int len;
const char *path; const char *path;
if (uninteresting(q->queue[i])) if (diff_unmodified_pair(q->queue[i]))
continue; continue;
path = q->queue[i]->two->path; path = q->queue[i]->two->path;
len = strlen(path); len = strlen(path);
@ -57,7 +50,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
const char *path; const char *path;
int len; int len;
if (uninteresting(q->queue[i])) if (diff_unmodified_pair(q->queue[i]))
continue; continue;
path = q->queue[i]->two->path; path = q->queue[i]->two->path;
len = strlen(path); len = strlen(path);