Merge branch 'jp/defbranch'

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index 9c839a94d0aee9ee9a9462c1646af52afef7d92d..0a0e22e7255b0db8b9446c496fa85b58d46e24aa 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -8,7 +8,6 @@
 
 #include "cgit.h"
 #include <stdio.h>
 
 #include "cgit.h"
 #include <stdio.h>

-#include <linux/limits.h>

 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;


@@ -70,6 +69,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
        ret->clone_url = ctx.cfg.clone_url;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
        ret->clone_url = ctx.cfg.clone_url;

+       ret->submodules.strdup_strings = 1;

        return ret;
 }
 
        return ret;
 }
 


@@ -392,7 +392,7 @@ void cgit_prepare_repo_env(struct cgit_repo * repo)
        p = env_vars;
        q = p + env_var_count;
        for (; p < q; p++)
        p = env_vars;
        q = p + env_var_count;
        for (; p < q; p++)

-               if (setenv(p->name, p->value, 1))
+               if (p->value && setenv(p->name, p->value, 1))

                        fprintf(stderr, warn, p->name, p->value);
 }
 
                        fprintf(stderr, warn, p->name, p->value);
 }