git-svn: correctly track diff-less copies with do_switch

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 978105b4973a96be5cba559c1bbcc7f7e24d83ce..dd1d4c1c1de310629282bcb772139e1edec22bf4 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -105,11 +105,11 @@ static int handle_file(const char *path,
                SHA1_Init(&ctx);
 
        while (fgets(buf, sizeof(buf), f)) {
-               if (!(-prefixcmp(buf, "<<<<<<< ")))
+               if (!prefixcmp(buf, "<<<<<<< "))
                        hunk = 1;
-               else if (!(-prefixcmp(buf, "=======")))
+               else if (!prefixcmp(buf, "======="))
                        hunk = 2;
-               else if (!(-prefixcmp(buf, ">>>>>>> "))) {
+               else if (!prefixcmp(buf, ">>>>>>> ")) {
                        hunk_no++;
                        hunk = 0;
                        if (memcmp(one->ptr, two->ptr, one->nr < two->nr ?