commit: --amend -m '' silently fails to wipe message

diff --git a/dir.c b/dir.c
index 480ad05c74aa6a5dea52907ff23583e145767999..56106c9ae8a954104d2f79aa2a352e7790eb21af 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1669,18 +1669,19 @@ int remove_dir_recursively(struct strbuf *path, int flag)
 void setup_standard_excludes(struct dir_struct *dir)
 {
        const char *path;
-       char *xdg_path;
 
        dir->exclude_per_dir = ".gitignore";
+
+       /* core.excludefile defaulting to $XDG_HOME/git/ignore */
+       if (!excludes_file)
+               excludes_file = xdg_config_home("ignore");
+       if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
+               add_excludes_from_file(dir, excludes_file);
+
+       /* per repository user preference */
        path = git_path("info/exclude");
-       if (!excludes_file) {
-               home_config_paths(NULL, &xdg_path, "ignore");
-               excludes_file = xdg_path;
-       }
        if (!access_or_warn(path, R_OK, 0))
                add_excludes_from_file(dir, path);
-       if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
-               add_excludes_from_file(dir, excludes_file);
 }
 
 int remove_path(const char *name)