diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
| commit | ee9693e246669f48f6b058a1044cefa973a44c22 (patch) | |
| tree | 80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /builtin-add.c | |
| parent | 39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff) | |
| parent | 5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff) | |
| download | git-ee9693e246669f48f6b058a1044cefa973a44c22.tar.gz git-ee9693e246669f48f6b058a1044cefa973a44c22.tar.xz | |
Merge branch 'jc/index-output'
* jc/index-output:
git-read-tree --index-output=<file>
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
Conflicts:
builtin-apply.c
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c index 7d1d5dc24..9ec292590 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -133,7 +133,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) git_config(git_add_config); - newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1); + newfd = hold_locked_index(&lock_file, 1); for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -209,7 +209,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || - close(newfd) || commit_lock_file(&lock_file)) + close(newfd) || commit_locked_index(&lock_file)) die("Unable to write new index file"); } |