Expand ~ in global exclude path.

xavierd · Nov 30, 2019 · ed40373 · ed40373
1 parent acdc0ac
commit ed40373
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,8 @@
 
  * Cleanup new directory if clone fails. (Jelmer Vernooĳ, #733)
 
+ * Expand "~" in global exclude path. (Jelmer Vernooĳ)
+
 0.19.13	2019-08-19
 
  BUG FIXES

diff --git a/dulwich/ignore.py b/dulwich/ignore.py
@@ -271,9 +271,7 @@ def default_user_ignore_filter_path(config):
     except KeyError:
         pass
 
-    xdg_config_home = os.environ.get(
-        "XDG_CONFIG_HOME", os.path.expanduser("~/.config/"),
-    )
+    xdg_config_home = os.environ.get("XDG_CONFIG_HOME", "~/.config/")
     return os.path.join(xdg_config_home, 'git', 'ignore')
 
 
@@ -366,7 +364,8 @@ def from_repo(cls, repo):
                 os.path.join(repo.controldir(), 'info', 'exclude'),
                 default_user_ignore_filter_path(repo.get_config_stack())]:
             try:
-                global_filters.append(IgnoreFilter.from_path(p))
+                global_filters.append(
+                    IgnoreFilter.from_path(os.path.expanduser(p)))
             except IOError:
                 pass
         config = repo.get_config_stack()