From 1f2997104f0d70282a9d5558d1c7b06393e66847 Mon Sep 17 00:00:00 2001
From: Cezary Zawadka <czawadka@gmail.com>
Date: Tue, 13 Jul 2010 16:17:43 +0200
Subject: [PATCH] Allow using UNC path for git repository

[efl: moved MinGW-specific part to compat/]

[jes: fixed compilation on non-Windows]

Signed-off-by: Cezary Zawadka <czawadka@gmail.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 cache.h           |  1 -
 compat/mingw.c    | 23 +++++++++++++++++++++++
 compat/mingw.h    |  2 ++
 git-compat-util.h |  4 ++++
 path.c            |  7 -------
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/cache.h b/cache.h
index 9e8ef43f13..15a2be07a4 100644
--- a/cache.h
+++ b/cache.h
@@ -729,7 +729,6 @@ int normalize_path_copy(char *dst, const char *src);
 int longest_ancestor_length(const char *path, const char *prefix_list);
 char *strip_path_suffix(const char *path, const char *suffix);
 int daemon_avoid_alias(const char *path);
-int offset_1st_component(const char *path);
 
 /* object replacement */
 #define READ_SHA1_FILE_REPLACE 1
diff --git a/compat/mingw.c b/compat/mingw.c
index 38b5807f4b..769ab0e267 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1849,3 +1849,26 @@ const char *get_windows_home_directory(void)
 
 	return home_directory;
 }
+
+int mingw_offset_1st_component(const char *path)
+{
+	if (has_dos_drive_prefix(path))
+		return 2 + is_dir_sep(path[2]);
+
+	/* unc paths */
+	if (is_dir_sep(path[0]) && is_dir_sep(path[1])) {
+
+		/* skip server name */
+		char *pos = strpbrk(path + 2, "\\/");
+		if (!pos)
+			return 0;
+
+		do {
+			pos++;
+		} while (*pos && !is_dir_sep(*pos));
+
+		return pos - path;
+	}
+
+	return is_dir_sep(path[0]);
+}
diff --git a/compat/mingw.h b/compat/mingw.h
index 2fcc935b78..1e5ec25cdc 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -310,6 +310,8 @@ static inline char *mingw_find_last_dir_sep(const char *path)
 	return ret;
 }
 #define find_last_dir_sep mingw_find_last_dir_sep
+int mingw_offset_1st_component(const char *path);
+#define offset_1st_component mingw_offset_1st_component
 #define PATH_SEP ';'
 #define PRIuMAX "I64u"
 
diff --git a/git-compat-util.h b/git-compat-util.h
index 953184818f..53865fb75f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -211,6 +211,10 @@ extern char *gitbasename(char *);
 #define has_dos_drive_prefix(path) 0
 #endif
 
+#ifndef offset_1st_component
+#define offset_1st_component(path) (is_dir_sep((path)[0]))
+#endif
+
 #ifndef is_dir_sep
 #define is_dir_sep(c) ((c) == '/')
 #endif
diff --git a/path.c b/path.c
index 4cb0585cde..242074b1cf 100644
--- a/path.c
+++ b/path.c
@@ -660,10 +660,3 @@ int daemon_avoid_alias(const char *p)
 		}
 	}
 }
-
-int offset_1st_component(const char *path)
-{
-	if (has_dos_drive_prefix(path))
-		return 2 + is_dir_sep(path[2]);
-	return is_dir_sep(path[0]);
-}
-- 
2.11.4.GIT