summaryrefslogtreecommitdiff
path: root/merge-recursive.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 /merge-recursive.c
parent39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff)
parent5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff)
downloadgit-ee9693e246669f48f6b058a1044cefa973a44c22.tar.gz
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 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 3611a2bdb7..2b614b64ba 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1378,7 +1378,7 @@ int main(int argc, char *argv[])
if (show(3))
printf("Merging %s with %s\n", branch1, branch2);
- index_fd = hold_lock_file_for_update(lock, get_index_file(), 1);
+ index_fd = hold_locked_index(lock, 1);
for (i = 0; i < bases_count; i++) {
struct commit *ancestor = get_ref(bases[i]);
@@ -1388,7 +1388,7 @@ int main(int argc, char *argv[])
if (active_cache_changed &&
(write_cache(index_fd, active_cache, active_nr) ||
- close(index_fd) || commit_lock_file(lock)))
+ close(index_fd) || commit_locked_index(lock)))
die ("unable to write %s", get_index_file());
return clean ? 0: 1;