X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=merge.c;h=7c1d756c3fad6f9570b31c2c36f96e9f90df39f4;hb=40e747e89d247b3a12e6cddf848d145bf403a72c;hp=91008f760223e4f6c65a5d344bb6403dd5885d28;hpb=bf29f074ed7019abb53398c4cd5659d9f939d9a8;p=thirdparty%2Fgit.git

diff --git a/merge.c b/merge.c
index 91008f7602..7c1d756c3f 100644
--- a/merge.c
+++ b/merge.c
@@ -37,7 +37,7 @@ int try_merge_command(struct repository *r,
 	argv_array_clear(&args);
 
 	discard_index(r->index);
-	if (read_index(r->index) < 0)
+	if (repo_read_index(r) < 0)
 		die(_("failed to read the cache"));
 	resolve_undo_clear_index(r->index);
 
@@ -58,7 +58,7 @@ int checkout_fast_forward(struct repository *r,
 
 	refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
 
-	if (hold_locked_index(&lock_file, LOCK_REPORT_ON_ERROR) < 0)
+	if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0)
 		return -1;
 
 	memset(&trees, 0, sizeof(trees));