merge-recursive: Mark some diff_filespec struct arguments const
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 11, 2011 at 23:19 UTC
0c05942087a14be4560d09299fb57117308a69d5
1 file changed
+10
-9
merge-recursive.c
+10
-9
@@ -459,9 +459,10 @@ static struct string_list *get_renames(struct merge_options *o,
459
return renames;
460
}
461
462
-static int update_stages_options(const char *path, struct diff_filespec *o,
463
- struct diff_filespec *a, struct diff_filespec *b,
464
- int clear, int options)
462
+static int update_stages_options(const char *path, const struct diff_filespec *o,
463
+ const struct diff_filespec *a,
464
+ const struct diff_filespec *b,
465
+ int clear, int options)
466
{
467
if (clear)
468
if (remove_file_from_cache(path))
@@ -710,9 +711,9 @@ struct merge_file_info {
711
712
static int merge_3way(struct merge_options *o,
713
mmbuffer_t *result_buf,
713
- struct diff_filespec *one,
714
- struct diff_filespec *a,
715
- struct diff_filespec *b,
714
+ const struct diff_filespec *one,
715
+ const struct diff_filespec *a,
716
+ const struct diff_filespec *b,
717
const char *branch1,
718
const char *branch2)
719
{
@@ -770,9 +771,9 @@ static int merge_3way(struct merge_options *o,
771
}
772
773
static struct merge_file_info merge_file(struct merge_options *o,
773
- struct diff_filespec *one,
774
- struct diff_filespec *a,
775
- struct diff_filespec *b,
774
+ const struct diff_filespec *one,
775
+ const struct diff_filespec *a,
776
+ const struct diff_filespec *b,
777
const char *branch1,
778
const char *branch2)
779
{