Merge branch 'jc/check-attr-honor-working-tree'

diff --git a/strbuf.c b/strbuf.c
index 1170d01c4322b494cd900853279766edd030de32..ee96dcfb816625436582833d812a7156513d5d39 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,22 +1,22 @@
 #include "cache.h"
 #include "refs.h"
 
-int prefixcmp(const char *str, const char *prefix)
+int starts_with(const char *str, const char *prefix)
 {
        for (; ; str++, prefix++)
                if (!*prefix)
-                       return 0;
+                       return 1;
                else if (*str != *prefix)
-                       return (unsigned char)*prefix - (unsigned char)*str;
+                       return 0;
 }
 
-int suffixcmp(const char *str, const char *suffix)
+int ends_with(const char *str, const char *suffix)
 {
        int len = strlen(str), suflen = strlen(suffix);
        if (len < suflen)
-               return -1;
+               return 0;
        else
-               return strcmp(str + len - suflen, suffix);
+               return !strcmp(str + len - suflen, suffix);
 }
 
 /*