mingw: use lowercase includes for some Windows headers

[thirdparty/git.git] / pathspec.c

diff --git a/pathspec.c b/pathspec.c
index 46e77a85fee9d86e6e16e9f466ecfc3db893fd16..6966b265d33aa8be6794a051b96668931c2b2092 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -1,9 +1,15 @@
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
+#include "gettext.h"
 #include "pathspec.h"
 #include "attr.h"
+#include "repository.h"
+#include "setup.h"
 #include "strvec.h"
+#include "symlinks.h"
 #include "quote.h"
 
 /*
@@ -545,7 +551,7 @@ static void NORETURN unsupported_magic(const char *pattern,
        }
        /*
         * We may want to substitute "this command" with a command
-        * name. E.g. when add--interactive dies when running
+        * name. E.g. when "git add -p" or "git add -i" dies when running
         * "checkout -p"
         */
        die(_("%s: pathspec magic not supported by this command: %s"),
@@ -681,8 +687,7 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
        int i, j;
 
        *dst = *src;
-       ALLOC_ARRAY(dst->items, dst->nr);
-       COPY_ARRAY(dst->items, src->items, dst->nr);
+       DUP_ARRAY(dst->items, src->items, dst->nr);
 
        for (i = 0; i < dst->nr; i++) {
                struct pathspec_item *d = &dst->items[i];
@@ -691,8 +696,7 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
                d->match = xstrdup(s->match);
                d->original = xstrdup(s->original);
 
-               ALLOC_ARRAY(d->attr_match, d->attr_match_nr);
-               COPY_ARRAY(d->attr_match, s->attr_match, d->attr_match_nr);
+               DUP_ARRAY(d->attr_match, s->attr_match, d->attr_match_nr);
                for (j = 0; j < d->attr_match_nr; j++) {
                        const char *value = s->attr_match[j].value;
                        d->attr_match[j].value = xstrdup_or_null(value);