[PATCH] diff: code clean-up and removal of rename hack.

diff --git a/diff.c b/diff.c
index 357c4efce1c76a42a56421ce90f35bc1555349dd..ac78782271b34dbeb7322f49dfb0b3b0ee7cfa20 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -796,7 +796,7 @@ static void diff_resolve_rename_copy(void)
                        for (j = 0; j < q->nr; j++) {
                                pp = q->queue[j];
                                if (!strcmp(p->one->path, pp->one->path) &&
-                                   pp->score) {
+                                   DIFF_PAIR_RENAME(pp)) {
                                        /* rename/copy are always valid
                                         * so we do not say DIFF_FILE_VALID()
                                         * on pp->one and pp->two.
@@ -815,7 +815,7 @@ static void diff_resolve_rename_copy(void)
                 * whose both sides are valid and of the same type, i.e.
                 * either in-place edit or rename/copy edit.
                 */
-               else if (p->score) {
+               else if (DIFF_PAIR_RENAME(p)) {
                        if (p->source_stays) {
                                p->status = 'C';
                                continue;
@@ -828,7 +828,7 @@ static void diff_resolve_rename_copy(void)
                                pp = q->queue[j];
                                if (strcmp(pp->one->path, p->one->path))
                                        continue; /* not us */
-                               if (!pp->score)
+                               if (!DIFF_PAIR_RENAME(pp))
                                        continue; /* not a rename/copy */
                                /* pp is a rename/copy from the same source */
                                p->status = 'C';
@@ -887,6 +887,18 @@ void diff_flush(int diff_output_style, int resolve_rename_copy)
        q->nr = q->alloc = 0;
 }
 
+void diffcore_std(const char **paths,
+                 int detect_rename, int rename_score,
+                 const char *pickaxe, int pickaxe_opts)
+{
+       if (paths && paths[0])
+               diffcore_pathspec(paths);
+       if (detect_rename)
+               diffcore_rename(detect_rename, rename_score);
+       if (pickaxe)
+               diffcore_pickaxe(pickaxe, pickaxe_opts);
+}
+
 void diff_addremove(int addremove, unsigned mode,
                    const unsigned char *sha1,
                    const char *base, const char *path)