X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-add.c;h=2d256981733345f4a430e11812b6851f0351aabd;hb=93d5f0619ccf10d7a16834b9e3be38871d2aae6c;hp=02fe38b0c4c7c61bcc51544d1fd54c0b1641e2e8;hpb=cd01d9445de1bbca8952c7ee16941f5fa10747f5;p=git.git diff --git a/builtin-add.c b/builtin-add.c index 02fe38b0c..2d2569817 100644 --- 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; } -static struct cache_file cache_file; +static struct lock_file lock_file; 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); - 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) - die("unable to create new cachefile"); + die("unable to create new index file"); 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) || - commit_index_file(&cache_file)) + close(newfd) || commit_lock_file(&lock_file)) die("Unable to write new index file"); }