{"thread":{"id":"160","subject":"[PATCH 2/3] rename object directory symbols","startedAt":"2005-04-20T04:32:06Z","lastAt":"2005-04-20T04:32:06Z","messageCount":1,"participants":["Zach Welch"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"936","messageId":"mailbox-1370-1113971526-296848@spoon","threadId":"160","inReplyTo":null,"subject":"[PATCH 2/3] rename object directory symbols","fromName":"Zach Welch","fromEmail":"zw@superlucidity.net","sentAt":"2005-04-20T04:32:06Z","receivedAt":"2005-04-20T04:32:06Z","isPatch":true,"sender":{"key":"zw@superlucidity.net","avatar":null},"body":"This patch applies on top of:\n        [PATCH 1/3] add GIT_CACHE_DIRECTORY support\n\n cache.h      |    4 ++--\n fsck-cache.c |    2 +-\n init-db.c    |    4 ++--\n ls-tree.c    |    4 ++--\n read-cache.c |    4 ++--\n sha1_file.c  |    2 +-\n 6 files changed, 10 insertions(+), 10 deletions(-)\n\nSigned-Off-By: Zach Welch <zw@superlucidity.net>\n\nRename the DB_ENVIRONMENT symbols to match the newly introduced\nGIT_CACHE_ENVIROMENT symbols.\n\ncache.h: 1fca894f485471d51c6a72c16e02df6d56d0052f\n--- a/cache.h\n+++ b/cache.h\n@@ -84,8 +84,8 @@ unsigned int active_nr, active_alloc;\n #define GIT_CACHE_ENVIRONMENT \"GIT_CACHE_DIRECTORY\"\n #define DEFAULT_GIT_CACHE_ENVIRONMENT \".git\"\n \n-#define DB_ENVIRONMENT \"SHA1_FILE_DIRECTORY\"\n-#define DEFAULT_DB_ENVIRONMENT \".git/objects\"\n+#define GIT_OBJECT_ENVIRONMENT \"SHA1_FILE_DIRECTORY\"\n+#define DEFAULT_GIT_OBJECT_ENVIRONMENT \".git/objects\"\n \n #define alloc_nr(x) (((x)+16)*3/2)\n \nfsck-cache.c: cf39b7e054d9685fde7004ec767cd098b97e8ce7\n--- a/fsck-cache.c\n+++ b/fsck-cache.c\n@@ -135,7 +135,7 @@ int main(int argc, char **argv)\n \tint i, heads;\n \tchar *sha1_dir;\n \n-\tsha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;\n+\tsha1_dir = getenv(GIT_OBJECT_ENVIRONMENT) ? : DEFAULT_GIT_OBJECT_ENVIRONMENT;\n \tfor (i = 0; i < 256; i++) {\n \t\tstatic char dir[4096];\n \t\tsprintf(dir, \"%s/%02x\", sha1_dir, i);\ninit-db.c: 9e693a0a914512c5574f394222cfc75496e3453a\n--- a/init-db.c\n+++ b/init-db.c\n@@ -33,9 +33,9 @@ int main(int argc, char **argv)\n \t}\t\n \tsafe_create_dir(git_dir);\n \n-\tsha1_dir = getenv(DB_ENVIRONMENT);\n+\tsha1_dir = getenv(GIT_OBJECT_ENVIRONMENT);\n \tif (!sha1_dir) {\n-\t\tsha1_dir = DEFAULT_DB_ENVIRONMENT;\n+\t\tsha1_dir = DEFAULT_GIT_OBJECT_ENVIRONMENT;\n \t\tfprintf(stderr, \"defaulting to local storage area\\n\");\n \t}\n \tlen = strlen(sha1_dir);\nls-tree.c: 936bb19a5525046a5a784d5f14c3ea7da406cc62\n--- a/ls-tree.c\n+++ b/ls-tree.c\n@@ -105,9 +105,9 @@ int main(int argc, char **argv)\n \t\tusage(ls_tree_usage);\n \tif (get_sha1_hex(argv[1], sha1) < 0)\n \t\tusage(ls_tree_usage);\n-\tsha1_file_directory = getenv(DB_ENVIRONMENT);\n+\tsha1_file_directory = getenv(GIT_OBJECT_ENVIRONMENT);\n \tif (!sha1_file_directory)\n-\t\tsha1_file_directory = DEFAULT_DB_ENVIRONMENT;\n+\t\tsha1_file_directory = DEFAULT_GIT_OBJECT_ENVIRONMENT;\n \tif (list(sha1) < 0)\n \t\tdie(\"list failed\");\n \treturn 0;\nread-cache.c: 9eee23097b9406548765ec6fc77e61788317df19\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -186,9 +186,9 @@ int read_cache(void)\n \t\treturn error(\"more than one cachefile\");\n \terrno = ENOENT;\n \n-\tsha1_file_directory = getenv(DB_ENVIRONMENT);\n+\tsha1_file_directory = getenv(GIT_OBJECT_ENVIRONMENT);\n \tif (!sha1_file_directory)\n-\t\tsha1_file_directory = DEFAULT_DB_ENVIRONMENT;\n+\t\tsha1_file_directory = DEFAULT_GIT_OBJECT_ENVIRONMENT;\n \tif (access(sha1_file_directory, X_OK) < 0)\n \t\treturn error(\"no access to SHA1 file directory\");\n \nsha1_file.c: c4591cd2168ae2e42c1fc9878be8befbfa1a8afa\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -61,7 +61,7 @@ char *sha1_file_name(const unsigned char\n \tstatic char *name, *base;\n \n \tif (!base) {\n-\t\tchar *sha1_file_directory = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;\n+\t\tchar *sha1_file_directory = getenv(GIT_OBJECT_ENVIRONMENT) ? : DEFAULT_GIT_OBJECT_ENVIRONMENT;\n \t\tint len = strlen(sha1_file_directory);\n \t\tbase = malloc(len + 60);\n \t\tmemcpy(base, sha1_file_directory, len);\n"}]}