builtin-merge: avoid run_command_v_opt() for recursive and subtree

diff --git a/wt-status.c b/wt-status.c
index eeb106e13e88c3ee2f61df41017e47b221f10ae3..889e50f89fc24984f700d14f7033600fa9fdf642 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -421,7 +421,7 @@ int git_status_config(const char *k, const char *v, void *cb)
        }
        if (!strcmp(k, "status.showuntrackedfiles")) {
                if (!v)
-                       return config_error_nonbool(v);
+                       return config_error_nonbool(k);
                else if (!strcmp(v, "no"))
                        show_untracked_files = SHOW_NO_UNTRACKED_FILES;
                else if (!strcmp(v, "normal"))