ui-summary: Pass filename to about-filter

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index e3ec533e0719ac1f34623dab2977d0a6c87af274..04682be06d8dd60dcecfbe5c89c4beeab1312880 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -37,10 +37,10 @@ static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
        switch (filtertype) {
                case SOURCE:
 
        switch (filtertype) {
                case SOURCE:

+               case ABOUT:

                        extra_args = 1;
                        break;
 
                        extra_args = 1;
                        break;
 

-               case ABOUT:

                case COMMIT:
                default:
                        extra_args = 0;
                case COMMIT:
                default:
                        extra_args = 0;


@@ -471,8 +471,6 @@ static char *guess_defbranch(void)
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {

-       char *user_home;
-       char *xdg_home;

        unsigned char sha1[20];
        int nongit = 0;
        int rc;
        unsigned char sha1[20];
        int nongit = 0;
        int rc;


@@ -483,11 +481,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        /* Do not look in /etc/ for gitconfig and gitattributes. */
        setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
        setenv("GIT_ATTR_NOSYSTEM", "1", 1);
        /* Do not look in /etc/ for gitconfig and gitattributes. */
        setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
        setenv("GIT_ATTR_NOSYSTEM", "1", 1);

-
-       /* We unset HOME and XDG_CONFIG_HOME before calling the git setup function
-        * so that we don't make unneccessary filesystem accesses. */
-       user_home = getenv("HOME");
-       xdg_home = getenv("XDG_CONFIG_HOME");

        unsetenv("HOME");
        unsetenv("XDG_CONFIG_HOME");
 
        unsetenv("HOME");
        unsetenv("XDG_CONFIG_HOME");
 


@@ -497,12 +490,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        setup_git_directory_gently(&nongit);
        init_display_notes(NULL);
 
        setup_git_directory_gently(&nongit);
        init_display_notes(NULL);
 

-       /* We restore the unset variables afterward. */
-       if (user_home)
-               setenv("HOME", user_home, 1);
-       if (xdg_home)
-               setenv("XDG_CONFIG_HOME", xdg_home, 1);
-

        if (nongit) {
                const char *name = ctx->repo->name;
                rc = errno;
        if (nongit) {
                const char *name = ctx->repo->name;
                rc = errno;