projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: don't allow commit if svn tree is not current
[git.git]
/
builtin-read-tree.c
diff --git
a/builtin-read-tree.c
b/builtin-read-tree.c
index
8d1a22d
..
bb50fbd
100644
(file)
--- a/
builtin-read-tree.c
+++ b/
builtin-read-tree.c
@@
-853,7
+853,7
@@
static void prime_cache_tree(void)
static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
int cmd_read_tree(int argc, const char **argv, char **envp)
{
int cmd_read_tree(int argc, const char **argv, char **envp)
{
@@
-864,9
+864,9
@@
int cmd_read_tree(int argc, const char **argv, char **envp)
setup_git_directory();
git_config(git_default_config);
setup_git_directory();
git_config(git_default_config);
- newfd = hold_
index_file_for_update(&cache
_file, get_index_file());
+ newfd = hold_
lock_file_for_update(&lock
_file, get_index_file());
if (newfd < 0)
if (newfd < 0)
- die("unable to create new
cache
file");
+ die("unable to create new
index
file");
git_config(git_default_config);
git_config(git_default_config);
@@
-981,7
+981,7
@@
int cmd_read_tree(int argc, const char **argv, char **envp)
}
if (write_cache(newfd, active_cache, active_nr) ||
}
if (write_cache(newfd, active_cache, active_nr) ||
- commit_
index_file(&cache
_file))
+ commit_
lock_file(&lock
_file))
die("unable to write new index file");
return 0;
}
die("unable to write new index file");
return 0;
}