From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2019 23:29:32 +0000 (-0800)
Subject: Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
X-Git-Tag: v2.21.0-rc0~110
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=25d90d1cb72ce51407324259516843406142fe89

Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'

Cygwin update.

* tb/use-common-win32-pathfuncs-on-cygwin:
  git clone <url> C:\cygwin\home\USER\repo' is working (again)
---

25d90d1cb72ce51407324259516843406142fe89
diff --cc compat/mingw.h
index 8c24ddaa3e,3387c3faeb..30d9fb3e36
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@@ -466,12 -403,7 +449,9 @@@ static inline void convert_slashes(cha
  		if (*path == '\\')
  			*path = '/';
  }
- #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 ';'
 +extern char *mingw_query_user_email(void);
 +#define query_user_email mingw_query_user_email
  #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
  #define PRIuMAX "I64u"
  #define PRId64 "I64d"