Merge branch 'jc/merge-refuse-new-root'

diff --git a/config.c b/config.c
index 9ba40bc1b039b9b65425dc4fa1bd9c7f1fcb0868..8f66519e616ad9ebb6ee2540028cd2f04ce46103 100644 (file)
--- a/config.c
+++ b/config.c
@@ -162,7 +162,7 @@ void git_config_push_parameter(const char *text)
 {
        struct strbuf env = STRBUF_INIT;
        const char *old = getenv(CONFIG_DATA_ENVIRONMENT);
-       if (old) {
+       if (old && *old) {
                strbuf_addstr(&env, old);
                strbuf_addch(&env, ' ');
        }