Commit f08c60a5 by Philip Kelley

Minor fixes for ignorecase support

parent ec40b7f9
...@@ -60,6 +60,8 @@ int git_attr_file__parse_buffer( ...@@ -60,6 +60,8 @@ int git_attr_file__parse_buffer(
char *context = NULL; char *context = NULL;
git_attr_rule *rule = NULL; git_attr_rule *rule = NULL;
GIT_UNUSED(parsedata);
assert(buffer && attrs); assert(buffer && attrs);
scan = buffer; scan = buffer;
......
...@@ -714,7 +714,7 @@ static int diff_from_iterators( ...@@ -714,7 +714,7 @@ static int diff_from_iterators(
* (or ADDED and DELETED pair if type changed) * (or ADDED and DELETED pair if type changed)
*/ */
else { 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 || if (maybe_modified(old_iter, oitem, new_iter, nitem, diff) < 0 ||
git_iterator_advance(old_iter, &oitem) < 0 || git_iterator_advance(old_iter, &oitem) < 0 ||
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "git2/index.h" #include "git2/index.h"
#include "vector.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_icase((STR), (PREFIX)) : \
git__prefixcmp((STR), (PREFIX))) git__prefixcmp((STR), (PREFIX)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment