diff options
| author | Philip Kelley <phkelley@hotmail.com> | 2012-09-17 16:10:42 -0400 |
|---|---|---|
| committer | Philip Kelley <phkelley@hotmail.com> | 2012-09-17 16:10:42 -0400 |
| commit | f08c60a51815d262979a9a95d69565e54adbdd80 (patch) | |
| tree | 1a363b5cd10ac1021bb8769089dac2239e959b23 | |
| parent | ec40b7f99f7f7161b0a1b24f1d8a934ec0eaacb1 (diff) | |
| download | libgit2-f08c60a51815d262979a9a95d69565e54adbdd80.tar.gz | |
Minor fixes for ignorecase support
| -rw-r--r-- | src/attr_file.c | 2 | ||||
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/iterator.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/attr_file.c b/src/attr_file.c index ca8bdd89d..485bcb434 100644 --- 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 1bda305ad..0e048443d 100644 --- 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 552d5ca0e..11cd2182c 100644 --- 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))) |