Minor fixes for ignorecase support

diff --git a/src/attr_file.c b/src/attr_file.c
index ca8bdd89d50c46cd4a04fc5c781cf4e03dee36b7..485bcb4349b6b0a688768c9c1468d030b4a53800 100644 (file)
--- a/src/attr_file.c
+++ b/src/attr_file.c
@@ -60,6 +60,8 @@ int git_attr_file__parse_buffer(
        char *context = NULL;
        git_attr_rule *rule = NULL;
 
+       GIT_UNUSED(parsedata);
+
        assert(buffer && attrs);
 
        scan = buffer;

diff --git a/src/diff.c b/src/diff.c
index 1bda305ade301d79a0d1af0e7b85b2a38b1aa623..0e048443d8541ef1726b99d595e8880bbefc4b11 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -714,7 +714,7 @@ static int diff_from_iterators(
                 * (or ADDED and DELETED pair if type changed)
                 */
                else {
-                       assert(oitem && nitem && entry_compare(oitem->path, nitem->path) == 0);
+                       assert(oitem && nitem && entry_compare(oitem, nitem) == 0);
 
                        if (maybe_modified(old_iter, oitem, new_iter, nitem, diff) < 0 ||
                                git_iterator_advance(old_iter, &oitem) < 0 ||

diff --git a/src/iterator.h b/src/iterator.h
index 552d5ca0e7642d7678df89a8fa2ecf9495a1a733..11cd2182c658d08c5c60e5fdbfb0baf43b8561e3 100644 (file)
--- a/src/iterator.h
+++ b/src/iterator.h
@@ -11,7 +11,7 @@
 #include "git2/index.h"
 #include "vector.h"
 
-#define ITERATOR_PREFIXCMP(ITER, STR, PREFIX)  (((ITER) ## .ignore_case) ? \
+#define ITERATOR_PREFIXCMP(ITER, STR, PREFIX)  (((ITER).ignore_case) ? \
        git__prefixcmp_icase((STR), (PREFIX)) : \
        git__prefixcmp((STR), (PREFIX)))