projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-tar-tree: no more void pointer arithmetic
[git.git]
/
write-tree.c
diff --git
a/write-tree.c
b/write-tree.c
index
895e7a3
..
bd07da6
100644
(file)
--- a/
write-tree.c
+++ b/
write-tree.c
@@
-13,7
+13,7
@@
static char *prefix = NULL;
static const char write_tree_usage[] =
"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
static const char write_tree_usage[] =
"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
@@
-21,7
+21,7
@@
int main(int argc, char **argv)
setup_git_directory();
setup_git_directory();
- newfd = hold_
index_file_for_update(&cache
_file, get_index_file());
+ newfd = hold_
lock_file_for_update(&lock
_file, get_index_file());
entries = read_cache();
while (1 < argc) {
entries = read_cache();
while (1 < argc) {
@@
-52,7
+52,7
@@
int main(int argc, char **argv)
die("git-write-tree: error building trees");
if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr))
die("git-write-tree: error building trees");
if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr))
- commit_
index_file(&cache
_file);
+ commit_
lock_file(&lock
_file);
}
/* Not being able to write is fine -- we are only interested
* in updating the cache-tree part, and if the next caller
}
/* Not being able to write is fine -- we are only interested
* in updating the cache-tree part, and if the next caller