getenv/setenv: use constants if available

There were places using "GIT_DIR" instead of GIT_DIR_ENVIRONMENT and
"GIT_CONFIG" instead of CONFIG_ENVIRONMENT.  This makes it easier to
find all places touching an environment variable using git grep or
similar tools.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-config.c b/builtin-config.c
index 3f7cab16d53718844a3964653a59c0feda730ad0..7d2063c1d2e9564306bb2807548f28a067ccdb88 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -178,14 +178,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                        char *home = getenv("HOME");
                        if (home) {
                                char *user_config = xstrdup(mkpath("%s/.gitconfig", home));
                        char *home = getenv("HOME");
                        if (home) {
                                char *user_config = xstrdup(mkpath("%s/.gitconfig", home));

-                               setenv("GIT_CONFIG", user_config, 1);
+                               setenv(CONFIG_ENVIRONMENT, user_config, 1);

                                free(user_config);
                        } else {
                                die("$HOME not set");
                        }
                }
                else if (!strcmp(argv[1], "--system"))
                                free(user_config);
                        } else {
                                die("$HOME not set");
                        }
                }
                else if (!strcmp(argv[1], "--system"))

-                       setenv("GIT_CONFIG", ETC_GITCONFIG, 1);
+                       setenv(CONFIG_ENVIRONMENT, ETC_GITCONFIG, 1);

                else if (!strcmp(argv[1], "--null") || !strcmp(argv[1], "-z")) {
                        term = '\0';
                        delim = '\n';
                else if (!strcmp(argv[1], "--null") || !strcmp(argv[1], "-z")) {
                        term = '\0';
                        delim = '\n';

diff --git a/path.c b/path.c
index 6395cf23098841c16d993ae7e86b2d8dcff01cd7..c4ce96236ae043b4d997536174936abb6ac40207 100644 (file)
--- a/path.c
+++ b/path.c
@@ -252,7 +252,7 @@ char *enter_repo(char *path, int strict)
 
        if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&
            validate_headref("HEAD") == 0) {
 
        if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&
            validate_headref("HEAD") == 0) {

-               setenv("GIT_DIR", ".", 1);
+               setenv(GIT_DIR_ENVIRONMENT, ".", 1);

                check_repository_format();
                return path;
        }
                check_repository_format();
                return path;
        }