Windows: Use the Windows style PATH separator ';'.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7414238fe52819689615e57d10f53dd2b29a3cbe..4e4bd6ddb18597d86dec8c5893f62bfd97ed67f1 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -409,9 +409,9 @@ git so take care if using Cogito etc.
 'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
        Due to the immutable nature of git objects, old objects can be
        archived into shared, read-only directories. This variable
 'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
        Due to the immutable nature of git objects, old objects can be
        archived into shared, read-only directories. This variable

-       specifies a ":" separated list of git object directories which
-       can be used to search for git objects. New objects will not be
-       written to these directories.
+       specifies a ":" separated (on Windows ";" separated) list
+       of git object directories which can be used to search for git
+       objects. New objects will not be written to these directories.

 
 'GIT_DIR'::
        If the 'GIT_DIR' environment variable is set then it
 
 'GIT_DIR'::
        If the 'GIT_DIR' environment variable is set then it

diff --git a/compat/mingw.h b/compat/mingw.h
index e5c0c6ba210d6a21dde1d5da9edc41cab4f3c0f1..22aae0077ef1a78fc54abdc1d0a04e3db23745a6 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -132,3 +132,9 @@ int getpagesize(void);      /* defined in MinGW's libgcc.a */
 struct passwd *getpwuid(int uid);
 int setitimer(int type, struct itimerval *in, struct itimerval *out);
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);
 struct passwd *getpwuid(int uid);
 int setitimer(int type, struct itimerval *in, struct itimerval *out);
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);

+
+/*
+ * git specific compatibility
+ */
+
+#define PATH_SEP ';'

diff --git a/exec_cmd.c b/exec_cmd.c
index e189caca629262334541ea8313d2931b06e67adf..a1bc4e04bf055709bf6fab3133e0a1832c56adee 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -37,7 +37,7 @@ static void add_path(struct strbuf *out, const char *path)
                else
                        strbuf_addstr(out, make_absolute_path(path));
 
                else
                        strbuf_addstr(out, make_absolute_path(path));
 

-               strbuf_addch(out, ':');
+               strbuf_addch(out, PATH_SEP);

        }
 }
 
        }
 }
 

diff --git a/git-compat-util.h b/git-compat-util.h
index da7249ac1cc5d3ccc69230face67ff43ee23101b..9dc733e56ceb2c2e95dfc3b14c29e825b3c25615 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -110,6 +110,10 @@
 #define PRIuMAX "llu"
 #endif
 
 #define PRIuMAX "llu"
 #endif
 

+#ifndef PATH_SEP
+#define PATH_SEP ':'
+#endif
+

 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #else
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #else

diff --git a/sha1_file.c b/sha1_file.c
index 191f814e09ee6067edf7b0acc73a04751e73a6da..6f004ffd09ac91912e2c84cdede2b6e7e3122b2b 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -392,7 +392,7 @@ void prepare_alt_odb(void)
        if (!alt) alt = "";
 
        alt_odb_tail = &alt_odb_list;
        if (!alt) alt = "";
 
        alt_odb_tail = &alt_odb_list;

-       link_alt_odb_entries(alt, alt + strlen(alt), ':', NULL, 0);
+       link_alt_odb_entries(alt, alt + strlen(alt), PATH_SEP, NULL, 0);

 
        read_info_alternates(get_object_directory(), 0);
 }
 
        read_info_alternates(get_object_directory(), 0);
 }