projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix read-cache.c collission check logic.
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
5c9d38b
..
9aec97f
100644
(file)
--- 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)
static void remove_lock_file(void)
{
if (remove_lock)
- unlink(".
dircache
/index.lock");
+ unlink(".
git
/index.lock");
}
int main(int argc, char **argv)
}
int main(int argc, char **argv)
@@
-76,9
+76,9
@@
int main(int argc, char **argv)
int i, newfd;
unsigned char sha1[20];
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)
if (newfd < 0)
-
usag
e("unable to create new cachefile");
+
di
e("unable to create new cachefile");
atexit(remove_lock_file);
remove_lock = 1;
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)
/* "-m" stands for "merge" current directory cache */
if (!strcmp(arg, "-m")) {
if (active_cache)
-
usag
e("read-tree: cannot merge old cache on top of new");
+
di
e("read-tree: cannot merge old cache on top of new");
if (read_cache() < 0)
if (read_cache() < 0)
-
usag
e("read-tree: corrupt directory cache");
+
di
e("read-tree: corrupt directory cache");
continue;
}
if (get_sha1_hex(arg, sha1) < 0)
usage("read-tree [-m] <sha1>");
if (read_tree(sha1, "", 0) < 0)
continue;
}
if (get_sha1_hex(arg, sha1) < 0)
usage("read-tree [-m] <sha1>");
if (read_tree(sha1, "", 0) < 0)
-
usag
e("failed to unpack tree object %s", arg);
+
di
e("failed to unpack tree object %s", arg);
}
if (write_cache(newfd, active_cache, active_nr) ||
}
if (write_cache(newfd, active_cache, active_nr) ||
- rename(".
dircache/index.lock", ".dircache
/index"))
-
usag
e("unable to write new index file");
+ rename(".
git/index.lock", ".git
/index"))
+
di
e("unable to write new index file");
remove_lock = 0;
return 0;
}
remove_lock = 0;
return 0;
}