fix: normalize Cygwin paths for separate worktrees

Author: msiemens

PyGitUp/gitup.py

@@ -42,6 +42,12 @@
 
 ON_WINDOWS = sys.platform == 'win32'
 
+def normalize_path(path):
+    if ON_WINDOWS and path and path[0] == '/':
+        return execute(['cygpath', '-m', path])
+
+    return path
+
 ###############################################################################
 # Setup of 3rd party libs
 ###############################################################################
@@ -61,8 +67,7 @@
 
 def get_git_dir():
     toplevel_dir = execute(['git', 'rev-parse', '--show-toplevel'])
-    if ON_WINDOWS and toplevel_dir and toplevel_dir[0] == '/':
-        toplevel_dir = execute(['cygpath', '-m', toplevel_dir])
+    toplevel_dir = normalize_path(toplevel_dir)
 
     if toplevel_dir is not None \
             and os.path.isfile(os.path.join(toplevel_dir, '.git')):
@@ -77,7 +82,8 @@ def get_git_dir():
         if inside_worktree == 'true' or Git().version_info[:3] < (2, 5, 0):
             return toplevel_dir
         else:
-            return execute(['git', 'rev-parse', '--git-common-dir'])
+            common_dir = execute(['git', 'rev-parse', '--git-common-dir'])
+            return normalize_path(common_dir)
 
     return toplevel_dir