Repository.xs: git_merge_analysis() signature change

jacquesg · Jun 8, 2014 · 5fd5b26 · 5fd5b26
1 parent 9145a2c
commit 5fd5b26
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xs/Repository.xs b/xs/Repository.xs
@@ -617,14 +617,15 @@ merge_analysis(self, ref)
 		int rc;
 
 		git_merge_head *merge_head;
+		git_merge_preference_t pref;
 		git_merge_analysis_t analysis;
 
 		AV *result;
 	CODE:
 		rc = git_merge_head_from_ref(&merge_head, self, ref);
 		git_check_error(rc);
 
-		rc = git_merge_analysis(&analysis,
+		rc = git_merge_analysis(&analysis, &pref,
 			self, (const git_merge_head **) &merge_head, 1);
 		git_merge_head_free(merge_head);
 		git_check_error(rc);