Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> --- Documentation/git.txt | 6 +++--- exec_cmd.c | 4 ++++ sha1_file.c | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index d57bed6..b2a5b60 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -382,9 +382,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 - 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 diff --git a/exec_cmd.c b/exec_cmd.c index e189cac..343545d 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -37,7 +37,11 @@ static void add_path(struct strbuf *out, const char *path) else strbuf_addstr(out, make_absolute_path(path)); +#ifdef __MINGW32__ + strbuf_addch(out, ';'); +#else strbuf_addch(out, ':'); +#endif } } diff --git a/sha1_file.c b/sha1_file.c index 1ddb96b..453bc43 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -389,7 +389,11 @@ void prepare_alt_odb(void) if (!alt) alt = ""; alt_odb_tail = &alt_odb_list; +#ifdef __MINGW32__ + link_alt_odb_entries(alt, alt + strlen(alt), ';', NULL, 0); +#else link_alt_odb_entries(alt, alt + strlen(alt), ':', NULL, 0); +#endif read_info_alternates(get_object_directory(), 0); } -- 1.5.4.1.126.ge5a7d - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
