summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-09 21:48:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-09 21:48:54 (GMT)
commita9ab586a5db015d200dfdadcf5876d62f15dd36c (patch)
tree7631ead8e5869cad95d4e4c8e33415508335b7a5 /diff.c
parent44ec46a9dff34d0d0d207741094b3a8ebd0e5324 (diff)
downloadgit-a9ab586a5db015d200dfdadcf5876d62f15dd36c.zip
git-a9ab586a5db015d200dfdadcf5876d62f15dd36c.tar.gz
git-a9ab586a5db015d200dfdadcf5876d62f15dd36c.tar.bz2
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>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 527cbf0..71696c5 100644
--- a/diff.c
+++ b/diff.c
@@ -32,10 +32,10 @@ static const char *external_diff(void)
*
* GIT_DIFF_OPTS="-c";
*/
- external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF");
+ external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
/* In case external diff fails... */
- env_diff_opts = gitenv("GIT_DIFF_OPTS");
+ env_diff_opts = getenv("GIT_DIFF_OPTS");
if (env_diff_opts) diff_opts = env_diff_opts;
done_preparing = 1;