@@ -791,7 +791,7 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
791
791
* marked with a single entry in the diff. If this flag is set to true,
792
792
* all files under ignored directories will be included in the diff, too.
793
793
*/
794
- static VALUE rb_git_index_diff (VALUE self , VALUE rb_other , VALUE rb_options )
794
+ static VALUE rb_git_diff_tree_to_index (VALUE self , VALUE rb_other , VALUE rb_options )
795
795
{
796
796
git_index * index ;
797
797
git_diff_options opts = GIT_DIFF_OPTIONS_INIT ;
@@ -806,13 +806,13 @@ static VALUE rb_git_index_diff(VALUE self, VALUE rb_other, VALUE rb_options)
806
806
owner = rugged_owner (self );
807
807
Data_Get_Struct (owner , git_repository , repo );
808
808
809
- // Need to flip the reverse option, so that the index is by default
810
- // the "old file" side of the diff.
811
- opts .flags ^= GIT_DIFF_REVERSE ;
809
+ // Need to flip the reverse option, so that the index is by default
810
+ // the "old file" side of the diff.
811
+ opts .flags ^= GIT_DIFF_REVERSE ;
812
812
813
- git_tree * other_tree ;
814
- Data_Get_Struct (rb_other , git_tree , other_tree );
815
- error = git_diff_tree_to_index (& diff , repo , other_tree , index , & opts );
813
+ git_tree * other_tree ;
814
+ Data_Get_Struct (rb_other , git_tree , other_tree );
815
+ error = git_diff_tree_to_index (& diff , repo , other_tree , index , & opts );
816
816
817
817
xfree (opts .pathspec .strings );
818
818
rugged_exception_check (error );
@@ -1229,7 +1229,7 @@ void Init_rugged_index(void)
1229
1229
rb_define_method (rb_cRuggedIndex , "get" , rb_git_index_get , -1 );
1230
1230
rb_define_method (rb_cRuggedIndex , "[]" , rb_git_index_get , -1 );
1231
1231
rb_define_method (rb_cRuggedIndex , "each" , rb_git_index_each , 0 );
1232
- rb_define_private_method (rb_cRuggedIndex , "_diff " , rb_git_index_diff , 2 );
1232
+ rb_define_private_method (rb_cRuggedIndex , "diff_tree_to_index " , rb_git_diff_tree_to_index , 2 );
1233
1233
rb_define_private_method (rb_cRuggedIndex , "diff_index_to_workdir" , rb_git_diff_index_to_workdir , 1 );
1234
1234
1235
1235
rb_define_method (rb_cRuggedIndex , "conflicts?" , rb_git_index_conflicts_p , 0 );
0 commit comments