aboutsummaryrefslogtreecommitdiff
path: root/builtin-mv.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 02:26:24 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-07 02:26:24 -0700
commitee9693e246669f48f6b058a1044cefa973a44c22 (patch)
tree80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /builtin-mv.c
parent39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff)
parent5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff)
downloadgit-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-mv.c')
-rw-r--r--builtin-mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-mv.c b/builtin-mv.c
index c4ab4784c..3563216ac 100644
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -77,7 +77,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
git_config(git_default_config);
- newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
+ newfd = hold_locked_index(&lock_file, 1);
if (read_cache() < 0)
die("index file corrupt");
@@ -285,7 +285,7 @@ int cmd_mv(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))
+ commit_locked_index(&lock_file))
die("Unable to write new index file");
}
}