projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
[git.git]
/
builtin-add.c
diff --git
a/builtin-add.c
b/builtin-add.c
index
02fe38b
..
bfbbb1b
100644
(file)
--- a/
builtin-add.c
+++ b/
builtin-add.c
@@
-122,7
+122,7
@@
static int add_file_to_index(const char *path, int verbose)
return 0;
}
return 0;
}
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
int cmd_add(int argc, const char **argv, char **envp)
{
int cmd_add(int argc, const char **argv, char **envp)
{
@@
-134,9
+134,9
@@
int cmd_add(int argc, const char **argv, char **envp)
git_config(git_default_config);
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");
if (read_cache() < 0)
die("index file corrupt");
if (read_cache() < 0)
die("index file corrupt");
@@
-181,7
+181,7
@@
int cmd_add(int argc, const char **argv, char **envp)
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
if (active_cache_changed) {
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");
}
die("Unable to write new index file");
}