@matheusbsbs / matheus-bagliano / commits / a9ab586a5d
Fork 0

Retire support for old environment variables.

We have deprecated the old environment variable names for quite a while and now it's time to remove them. Gone are: SHA1_FILE_DIRECTORIES AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME COMMIT_AUTHOR_EMAIL COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 9, 2005 at 14:48 UTC a9ab586a5db015d200dfdadcf5876d62f15dd36c
13 files changed +16 -318
Makefile
+1 -1
@@ -124,7 +124,7 @@ DIFF_OBJS = \
124
125 LIB_OBJS = \
126 blob.o commit.o connect.o count-delta.o csum-file.o \
127 - date.o diff-delta.o entry.o gitenv.o ident.o index.o \
127 + date.o diff-delta.o entry.o ident.o index.o \
128 object.o pack-check.o patch-delta.o path.o pkt-line.o \
129 quote.o read-cache.o refs.o rev-cache.o run-command.o \
130 server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
cache.h
-11
@@ -53,17 +53,6 @@
53 */
54 #define DEFAULT_GIT_PORT 9418
55
56 -/*
57 - * Environment variables transition.
58 - * We accept older names for now but warn.
59 - */
60 -extern char *gitenv_bc(const char *);
61 -#ifdef __GNUC__
62 -#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
63 -#else
64 -#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
65 -#endif
66 -
56 /*
57 * Basic data structures for the directory cache
58 */
diff.c
+2 -2
@@ -32,10 +32,10 @@ static const char *external_diff(void)
32 *
33 * GIT_DIFF_OPTS="-c";
34 */
35 - external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF");
35 + external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
36
37 /* In case external diff fails... */
38 - env_diff_opts = gitenv("GIT_DIFF_OPTS");
38 + env_diff_opts = getenv("GIT_DIFF_OPTS");
39 if (env_diff_opts) diff_opts = env_diff_opts;
40
41 done_preparing = 1;
fsck-objects.c
+1 -1
@@ -392,7 +392,7 @@ static int fsck_head_link(void)
392 static char path[PATH_MAX], link[PATH_MAX];
393 const char *git_dir;
394
395 - git_dir = gitenv(GIT_DIR_ENVIRONMENT);
395 + git_dir = getenv(GIT_DIR_ENVIRONMENT);
396 if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
397
398 snprintf(path, sizeof(path), "%s/HEAD", git_dir);
gitenv.c deleted
-75
@@ -1,75 +0,0 @@
1 -/*
2 - * Copyright (C) 2005 Junio C Hamano
3 - */
4 -#include "cache.h"
5 -
6 -/*
7 - * This array must be sorted by its canonical name, because
8 - * we do look-up by binary search.
9 - */
10 -static struct backward_compatible_env {
11 - const char *canonical;
12 - const char *old;
13 -} bc_name[] = {
14 - { "GIT_ALTERNATE_OBJECT_DIRECTORIES", "SHA1_FILE_DIRECTORIES" },
15 - { "GIT_AUTHOR_DATE", "AUTHOR_DATE" },
16 - { "GIT_AUTHOR_EMAIL", "AUTHOR_EMAIL" },
17 - { "GIT_AUTHOR_NAME", "AUTHOR_NAME" },
18 - { "GIT_COMMITTER_EMAIL", "COMMIT_AUTHOR_EMAIL" },
19 - { "GIT_COMMITTER_NAME", "COMMIT_AUTHOR_NAME" },
20 - { "GIT_OBJECT_DIRECTORY", "SHA1_FILE_DIRECTORY" },
21 -};
22 -
23 -static void warn_old_environment(int pos)
24 -{
25 - int i;
26 - static int warned = 0;
27 - if (warned)
28 - return;
29 -
30 - warned = 1;
31 - fprintf(stderr,
32 - "warning: Attempting to use %s\n",
33 - bc_name[pos].old);
34 - fprintf(stderr,
35 - "warning: GIT environment variables have been renamed.\n"
36 - "warning: Please adjust your scripts and environment.\n");
37 - for (i = 0; i < sizeof(bc_name) / sizeof(bc_name[0]); i++) {
38 - /* warning is needed only when old name is there and
39 - * new name is not.
40 - */
41 - if (!getenv(bc_name[i].canonical) && getenv(bc_name[i].old))
42 - fprintf(stderr, "warning: old %s => new %s\n",
43 - bc_name[i].old, bc_name[i].canonical);
44 - }
45 -}
46 -
47 -char *gitenv_bc(const char *e)
48 -{
49 - int first, last;
50 - char *val = getenv(e);
51 - if (val)
52 - die("gitenv_bc called on existing %s; fix the caller.", e);
53 -
54 - first = 0;
55 - last = sizeof(bc_name) / sizeof(bc_name[0]);
56 - while (last > first) {
57 - int next = (last + first) >> 1;
58 - int cmp = strcmp(e, bc_name[next].canonical);
59 - if (!cmp) {
60 - val = getenv(bc_name[next].old);
61 - /* If the user has only old name, warn.
62 - * otherwise stay silent.
63 - */
64 - if (val)
65 - warn_old_environment(next);
66 - return val;
67 - }
68 - if (cmp < 0) {
69 - last = next;
70 - continue;
71 - }
72 - first = next+1;
73 - }
74 - return NULL;
75 -}
http-fetch.c
+1 -1
@@ -355,7 +355,7 @@ int main(int argc, char **argv)
355
356 curl = curl_easy_init();
357
358 - curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
358 + curl_ssl_verify = getenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
359 curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify);
360 #if LIBCURL_VERSION_NUM >= 0x070907
361 curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
ident.c
+2 -2
@@ -150,10 +150,10 @@ char *get_ident(const char *name, const char *email, const char *date_str)
150
151 char *git_author_info(void)
152 {
153 - return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE"));
153 + return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
154 }
155
156 char *git_committer_info(void)
157 {
158 - return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE"));
158 + return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
159 }
init-db.c
+1 -1
@@ -226,7 +226,7 @@ int main(int argc, char **argv)
226 /*
227 * Set up the default .git directory contents
228 */
229 - git_dir = gitenv(GIT_DIR_ENVIRONMENT);
229 + git_dir = getenv(GIT_DIR_ENVIRONMENT);
230 if (!git_dir) {
231 git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
232 fprintf(stderr, "defaulting to local storage area\n");
path.c
+1 -1
@@ -45,7 +45,7 @@ char *git_path(const char *fmt, ...)
45 va_list args;
46 unsigned len;
47
48 - git_dir = gitenv(GIT_DIR_ENVIRONMENT);
48 + git_dir = getenv(GIT_DIR_ENVIRONMENT);
49 if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
50 len = strlen(git_dir);
51 if (len > PATH_MAX-100)
setup.c
+2 -2
@@ -87,7 +87,7 @@ static int is_toplevel_directory(void)
87 return !lstat(".git/HEAD", &st) &&
88 S_ISLNK(st.st_mode) &&
89 !access(".git/refs/", X_OK) &&
90 - (gitenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
90 + (getenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
91 }
92
93 const char *setup_git_directory(void)
@@ -99,7 +99,7 @@ const char *setup_git_directory(void)
99 * If GIT_DIR is set explicitly, we're not going
100 * to do any discovery
101 */
102 - if (gitenv(GIT_DIR_ENVIRONMENT))
102 + if (getenv(GIT_DIR_ENVIRONMENT))
103 return NULL;
104
105 if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')
sha1_file.c
+5 -5
@@ -50,22 +50,22 @@ static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
50 *git_graft_file;
51 static void setup_git_env(void)
52 {
53 - git_dir = gitenv(GIT_DIR_ENVIRONMENT);
53 + git_dir = getenv(GIT_DIR_ENVIRONMENT);
54 if (!git_dir)
55 git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
56 - git_object_dir = gitenv(DB_ENVIRONMENT);
56 + git_object_dir = getenv(DB_ENVIRONMENT);
57 if (!git_object_dir) {
58 git_object_dir = xmalloc(strlen(git_dir) + 9);
59 sprintf(git_object_dir, "%s/objects", git_dir);
60 }
61 git_refs_dir = xmalloc(strlen(git_dir) + 6);
62 sprintf(git_refs_dir, "%s/refs", git_dir);
63 - git_index_file = gitenv(INDEX_ENVIRONMENT);
63 + git_index_file = getenv(INDEX_ENVIRONMENT);
64 if (!git_index_file) {
65 git_index_file = xmalloc(strlen(git_dir) + 7);
66 sprintf(git_index_file, "%s/index", git_dir);
67 }
68 - git_graft_file = gitenv(GRAFT_ENVIRONMENT);
68 + git_graft_file = getenv(GRAFT_ENVIRONMENT);
69 if (!git_graft_file)
70 git_graft_file = strdup(git_path("info/grafts"));
71 }
@@ -285,7 +285,7 @@ void prepare_alt_odb(void)
285 struct stat st;
286 char *alt;
287
288 - alt = gitenv(ALTERNATE_DB_ENVIRONMENT);
288 + alt = getenv(ALTERNATE_DB_ENVIRONMENT);
289 if (!alt) alt = "";
290
291 sprintf(path, "%s/info/alternates", get_object_directory());
t/t0100-environment-names.sh deleted
-84
@@ -1,84 +0,0 @@
1 -#!/bin/sh
2 -#
3 -# Copyright (c) 2005 Junio C Hamano
4 -#
5 -
6 -test_description='general environment name warning test.
7 -
8 -This test makes sure that use of deprecated environment variables
9 -trigger the warnings from gitenv().'
10 -
11 -env_vars='GIT_AUTHOR_DATE:AUTHOR_DATE
12 -GIT_AUTHOR_EMAIL:AUTHOR_EMAIL
13 -GIT_AUTHOR_NAME:AUTHOR_NAME
14 -GIT_COMMITTER_EMAIL:COMMIT_AUTHOR_EMAIL
15 -GIT_COMMITTER_NAME:COMMIT_AUTHOR_NAME
16 -GIT_ALTERNATE_OBJECT_DIRECTORIES:SHA1_FILE_DIRECTORIES
17 -GIT_OBJECT_DIRECTORY:SHA1_FILE_DIRECTORY
18 -'
19 -
20 -. ./test-lib.sh
21 -
22 -export_them () {
23 - for ev in $env_vars
24 - do
25 - new=$(expr "$ev" : '\(.*\):')
26 - old=$(expr "$ev" : '.*:\(.*\)')
27 - # Build and eval the following:
28 - # case "${VAR+set}" in set) export VAR;; esac
29 - evstr='case "${'$new'+set}" in set) export '$new';; esac'
30 - eval "$evstr"
31 - evstr='case "${'$old'+set}" in set) export '$old';; esac'
32 - eval "$evstr"
33 - done
34 -}
35 -
36 -date >path0
37 -git-update-index --add path0
38 -tree=$(git-write-tree)
39 -
40 -AUTHOR_DATE='Wed May 11 23:55:18 2005'
41 -AUTHOR_EMAIL='author@example.xz'
42 -AUTHOR_NAME='A U Thor'
43 -COMMIT_AUTHOR_EMAIL='author@example.xz'
44 -COMMIT_AUTHOR_NAME='A U Thor'
45 -SHA1_FILE_DIRECTORY=.git/objects
46 -
47 -export_them
48 -
49 -echo 'foo' | git-commit-tree $tree >/dev/null 2>errmsg
50 -cat >expected-err <<\EOF
51 -warning: Attempting to use SHA1_FILE_DIRECTORY
52 -warning: GIT environment variables have been renamed.
53 -warning: Please adjust your scripts and environment.
54 -warning: old AUTHOR_DATE => new GIT_AUTHOR_DATE
55 -warning: old AUTHOR_EMAIL => new GIT_AUTHOR_EMAIL
56 -warning: old AUTHOR_NAME => new GIT_AUTHOR_NAME
57 -warning: old COMMIT_AUTHOR_EMAIL => new GIT_COMMITTER_EMAIL
58 -warning: old COMMIT_AUTHOR_NAME => new GIT_COMMITTER_NAME
59 -warning: old SHA1_FILE_DIRECTORY => new GIT_OBJECT_DIRECTORY
60 -EOF
61 -sed -ne '/^warning: /p' <errmsg >generated-err
62 -
63 -test_expect_success \
64 - 'using old names should issue warnings.' \
65 - 'cmp generated-err expected-err'
66 -
67 -for ev in $env_vars
68 -do
69 - new=$(expr "$ev" : '\(.*\):')
70 - old=$(expr "$ev" : '.*:\(.*\)')
71 - # Build and eval the following:
72 - # NEWENV=$OLDENV
73 - evstr="$new=\$$old"
74 - eval "$evstr"
75 -done
76 -export_them
77 -echo 'foo' | git-commit-tree $tree >/dev/null 2>errmsg
78 -sed -ne '/^warning: /p' <errmsg >generated-err
79 -
80 -test_expect_success \
81 - 'using old names but having new names should not issue warnings.' \
82 - 'cmp generated-err /dev/null'
83 -
84 -test_done
t/t0110-environment-names-old.sh deleted
-132
@@ -1,132 +0,0 @@
1 -#!/bin/sh
2 -#
3 -# Copyright (c) 2005 Junio C Hamano
4 -#
5 -
6 -test_description='Using new and old environment names.
7 -
8 -This test makes sure that use of deprecated environment variables
9 -still works, using both new and old names makes new one take precedence,
10 -and GIT_DIR and GIT_ALTERNATE_OBJECT_DIRECTORIES mechanism works.'
11 -
12 -env_vars='GIT_AUTHOR_DATE:AUTHOR_DATE
13 -GIT_AUTHOR_EMAIL:AUTHOR_EMAIL
14 -GIT_AUTHOR_NAME:AUTHOR_NAME
15 -GIT_COMMITTER_EMAIL:COMMIT_AUTHOR_EMAIL
16 -GIT_COMMITTER_NAME:COMMIT_AUTHOR_NAME
17 -GIT_ALTERNATE_OBJECT_DIRECTORIES:SHA1_FILE_DIRECTORIES
18 -GIT_OBJECT_DIRECTORY:SHA1_FILE_DIRECTORY
19 -'
20 -
21 -. ./test-lib.sh
22 -
23 -export_them () {
24 - for ev in $env_vars
25 - do
26 - new=$(expr "$ev" : '\(.*\):')
27 - old=$(expr "$ev" : '.*:\(.*\)')
28 - # Build and eval the following:
29 - # case "${VAR+set}" in set) export VAR;; esac
30 - evstr='case "${'$new'+set}" in set) export '$new';; esac'
31 - eval "$evstr"
32 - evstr='case "${'$old'+set}" in set) export '$old';; esac'
33 - eval "$evstr"
34 - done
35 -}
36 -
37 -SHA1_FILE_DIRECTORY=.svn/objects ;# whoa
38 -export SHA1_FILE_DIRECTORY
39 -
40 -rm -fr .git
41 -mkdir .svn
42 -test_expect_success \
43 - 'using SHA1_FILE_DIRECTORY in git-init-db' \
44 - 'git-init-db && test -d .svn/objects/cb'
45 -
46 -unset SHA1_FILE_DIRECTORY
47 -GIT_DIR=.svn
48 -export GIT_DIR
49 -rm -fr .git .svn
50 -mkdir .svn
51 -test_expect_success \
52 - 'using GIT_DIR in git-init-db' \
53 - 'git-init-db && test -d .svn/objects/cb'
54 -
55 -date >path0
56 -test_expect_success \
57 - 'using GIT_DIR in git-update-index' \
58 - 'git-update-index --add path0 && test -f .svn/index'
59 -
60 -sedScript='s|\(..\)|.svn/objects/\1/|'
61 -
62 -test_expect_success \
63 - 'using GIT_DIR in git-write-tree' \
64 - 'tree=$(git-write-tree) &&
65 - test -f $(echo "$tree" | sed -e "$sedScript")'
66 -
67 -AUTHOR_DATE='Sat May 14 00:00:00 2005 -0000'
68 -AUTHOR_EMAIL='author@example.xz'
69 -AUTHOR_NAME='A U Thor'
70 -COMMIT_AUTHOR_EMAIL='author@example.xz'
71 -COMMIT_AUTHOR_NAME='A U Thor'
72 -export_them
73 -
74 -test_expect_success \
75 - 'using GIT_DIR and old variable names in git-commit-tree' \
76 - 'commit=$(echo foo | git-commit-tree $tree) &&
77 - test -f $(echo "$commit" | sed -e "$sedScript")'
78 -
79 -test_expect_success \
80 - 'using GIT_DIR in git-cat-file' \
81 - 'git-cat-file commit $commit >current'
82 -
83 -cat >expected <<\EOF
84 -author A U Thor <author@example.xz>
85 -committer A U Thor <author@example.xz>
86 -EOF
87 -test_expect_success \
88 - 'verify old AUTHOR variables were used correctly in commit' \
89 - 'sed -ne '\''/^\(author\)/s|>.*|>|p'\'' -e'\''/^\(committer\)/s|>.*|>|p'\''\ current > out && cmp out expected'
90 -
91 -unset GIT_DIR
92 -test_expect_success \
93 - 'git-init-db without GIT_DIR' \
94 - 'git-init-db && test -d .git && test -d .git/objects/ef'
95 -
96 -SHA1_FILE_DIRECTORIES=.svn/objects
97 -export SHA1_FILE_DIRECTORIES
98 -
99 -test_expect_success \
100 - 'using SHA1_FILE_DIRECTORIES with git-ls-tree' \
101 - 'git-ls-tree $commit && git-ls-tree $tree'
102 -
103 -GIT_AUTHOR_DATE='Sat May 14 12:00:00 2005 -0000'
104 -GIT_AUTHOR_EMAIL='rohtua@example.xz'
105 -GIT_AUTHOR_NAME='R O Htua'
106 -GIT_COMMITTER_EMAIL='rohtua@example.xz'
107 -GIT_COMMITTER_NAME='R O Htua'
108 -export_them
109 -
110 -sedScript='s|\(..\)|.git/objects/\1/|'
111 -test_expect_success \
112 - 'using new author variables with git-commit-tree' \
113 - 'commit2=$(echo foo | git-commit-tree $tree) &&
114 - test -f $(echo "$commit2" | sed -e "$sedScript")'
115 -
116 -GIT_ALTERNATE_OBJECT_DIRECTORIES=.git/objects
117 -GIT_DIR=nowhere
118 -export GIT_DIR GIT_ALTERNATE_OBJECT_DIRECTORIES
119 -
120 -test_expect_success \
121 - 'git-cat-file with GIT_DIR and GIT_ALTERNATE_OBJECT_DIRECTORIES' \
122 - 'git-cat-file commit $commit2 >current'
123 -
124 -cat >expected <<\EOF
125 -author R O Htua <rohtua@example.xz>
126 -committer R O Htua <rohtua@example.xz>
127 -EOF
128 -test_expect_success \
129 - 'verify new AUTHOR variables were used correctly in commit.' \
130 - 'sed -ne '\''/^\(author\)/s|>.*|>|p'\'' -e'\''/^\(committer\)/s|>.*|>|p'\''\ current > out && cmp out expected'
131 -
132 -test_done