traverse_trees(): handle D/F conflict case sanely

diff --git a/config.c b/config.c
index b3d1ff4e7cc3eb6ec72aa2d5140def5de5c6966b..37385ce9d338ecbd2556cef9455000784ebab7e5 100644 (file)
--- a/config.c
+++ b/config.c
@@ -477,6 +477,11 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.notesref")) {
+               notes_ref_name = xstrdup(value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.pager"))
                return git_config_string(&pager_program, var, value);