X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=9aec97fa73d4e6bd2354988536af8826dbb9ed04;hb=f864ba7448564d06e8076d1b6a66eca00a337d8c;hp=5c9d38ba5812b4b8ac4a3d5acbcc274b697efcfc;hpb=9614b8dcf8f295b6063d2a85bf8ec53960b072b6;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 5c9d38ba..9aec97fa 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -68,7 +68,7 @@ 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)
@@ -76,9 +76,9 @@ 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");
+		die("unable to create new cachefile");
 	atexit(remove_lock_file);
 	remove_lock = 1;
 
@@ -88,19 +88,19 @@ int main(int argc, char **argv)
 		/* "-m" stands for "merge" current directory cache */
 		if (!strcmp(arg, "-m")) {
 			if (active_cache)
-				usage("read-tree: cannot merge old cache on top of new");
+				die("read-tree: cannot merge old cache on top of new");
 			if (read_cache() < 0)
-				usage("read-tree: corrupt directory cache");
+				die("read-tree: corrupt directory cache");
 			continue;
 		}
 		if (get_sha1_hex(arg, sha1) < 0)
 			usage("read-tree [-m] <sha1>");
 		if (read_tree(sha1, "", 0) < 0)
-			usage("failed to unpack tree object %s", arg);
+			die("failed to unpack tree object %s", arg);
 	}
 	if (write_cache(newfd, active_cache, active_nr) ||
-	    rename(".dircache/index.lock", ".dircache/index"))
-		usage("unable to write new index file");
+	    rename(".git/index.lock", ".git/index"))
+		die("unable to write new index file");
 	remove_lock = 0;
 	return 0;
 }