summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-15 01:36:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 01:41:12 (GMT)
commita976b0a5933f37e7e8a1829703705268bc829794 (patch)
treee653c90b0fd1495dd0b8f260aebd55502c2ef6aa /combine-diff.c
parent968a1d65f430e4e8234204c62361e3d21cac810c (diff)
downloadgit-a976b0a5933f37e7e8a1829703705268bc829794.zip
git-a976b0a5933f37e7e8a1829703705268bc829794.tar.gz
git-a976b0a5933f37e7e8a1829703705268bc829794.tar.bz2
Remove combine-diff.c::uninteresting()
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>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/combine-diff.c b/combine-diff.c
index f2f3806..4c6bfed 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -7,13 +7,6 @@
#include "xdiff-interface.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)
{
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++) {
int len;
const char *path;
- if (uninteresting(q->queue[i]))
+ if (diff_unmodified_pair(q->queue[i]))
continue;
path = q->queue[i]->two->path;
len = strlen(path);
@@ -57,7 +50,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
const char *path;
int len;
- if (uninteresting(q->queue[i]))
+ if (diff_unmodified_pair(q->queue[i]))
continue;
path = q->queue[i]->two->path;
len = strlen(path);