Skip to content

Commit

Permalink
Rename ".dircache" directory to ".git"
Browse files Browse the repository at this point in the history
I started out calling the tool "dircache". That's clearly moronic.
  • Loading branch information
Linus Torvalds committed Apr 11, 2005
1 parent 9614b8d commit 4bb04f2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ it's not something "git" does for you.
Another way of saying the same thing: "git" itself only handles content
integrity, the trust has to come from outside.

Current Directory Cache (".dircache/index")
Current Directory Cache (".git/index")

The "current directory cache" is a simple binary file, which contains an
efficient representation of a virtual directory content at some random
Expand Down
2 changes: 1 addition & 1 deletion cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct cache_entry **active_cache;
unsigned int active_nr, active_alloc;

#define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY"
#define DEFAULT_DB_ENVIRONMENT ".dircache/objects"
#define DEFAULT_DB_ENVIRONMENT ".git/objects"

#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
#define ce_size(ce) cache_entry_size((ce)->namelen)
Expand Down
4 changes: 2 additions & 2 deletions init-db.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ int main(int argc, char **argv)
char *sha1_dir = getenv(DB_ENVIRONMENT), *path;
int len, i;

if (mkdir(".dircache", 0755) < 0) {
perror("unable to create .dircache");
if (mkdir(".git", 0755) < 0) {
perror("unable to create .git directory");
exit(1);
}

Expand Down
2 changes: 1 addition & 1 deletion read-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ int read_cache(void)
sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
if (access(sha1_file_directory, X_OK) < 0)
return error("no access to SHA1 file directory");
fd = open(".dircache/index", O_RDONLY);
fd = open(".git/index", O_RDONLY);
if (fd < 0)
return (errno == ENOENT) ? 0 : error("open failed");

Expand Down
6 changes: 3 additions & 3 deletions read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ static int remove_lock = 0;
static void remove_lock_file(void)
{
if (remove_lock)
unlink(".dircache/index.lock");
unlink(".git/index.lock");
}

int main(int argc, char **argv)
{
int i, newfd;
unsigned char sha1[20];

newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
if (newfd < 0)
usage("unable to create new cachefile");
atexit(remove_lock_file);
Expand All @@ -99,7 +99,7 @@ int main(int argc, char **argv)
usage("failed to unpack tree object %s", arg);
}
if (write_cache(newfd, active_cache, active_nr) ||
rename(".dircache/index.lock", ".dircache/index"))
rename(".git/index.lock", ".git/index"))
usage("unable to write new index file");
remove_lock = 0;
return 0;
Expand Down
8 changes: 4 additions & 4 deletions update-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ static void refresh_cache(void)
/*
* We fundamentally don't like some paths: we don't want
* dot or dot-dot anywhere, and in fact, we don't even want
* any other dot-files (.dircache or anything else). They
* any other dot-files (.git or anything else). They
* are hidden, for chist sake.
*
* Also, we don't want double slashes or slashes at the
Expand Down Expand Up @@ -235,15 +235,15 @@ static int remove_lock = 0;
static void remove_lock_file(void)
{
if (remove_lock)
unlink(".dircache/index.lock");
unlink(".git/index.lock");
}

int main(int argc, char **argv)
{
int i, newfd, entries;
int allow_options = 1;

newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
if (newfd < 0)
usage("unable to create new cachefile");

Expand Down Expand Up @@ -284,7 +284,7 @@ int main(int argc, char **argv)
usage("Unable to add %s to database", path);
}
if (write_cache(newfd, active_cache, active_nr) ||
rename(".dircache/index.lock", ".dircache/index"))
rename(".git/index.lock", ".git/index"))
usage("Unable to write new cachefile");

remove_lock = 0;
Expand Down

0 comments on commit 4bb04f2

Please sign in to comment.