mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Mark some diff_filespec struct arguments const

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2011-08-11 23:19:51 -06:00
committed by Junio C Hamano
parent abafc88e76
commit 0c05942087
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
merge-recursive.c
View File

@ -459,8 +459,9 @@ static struct string_list *get_renames(struct merge_options *o,
return renames; return renames;
} }
static int update_stages_options(const char *path, struct diff_filespec *o, static int update_stages_options(const char *path, const struct diff_filespec *o,
struct diff_filespec *a, struct diff_filespec *b, const struct diff_filespec *a,
const struct diff_filespec *b,
int clear, int options) int clear, int options)
{ {
if (clear) if (clear)
@ -710,9 +711,9 @@ struct merge_file_info {
static int merge_3way(struct merge_options *o, static int merge_3way(struct merge_options *o,
mmbuffer_t *result_buf, mmbuffer_t *result_buf,
struct diff_filespec *one, const struct diff_filespec *one,
struct diff_filespec *a, const struct diff_filespec *a,
struct diff_filespec *b, const struct diff_filespec *b,
const char *branch1, const char *branch1,
const char *branch2) const char *branch2)
{ {
@ -770,9 +771,9 @@ static int merge_3way(struct merge_options *o,
} }
static struct merge_file_info merge_file(struct merge_options *o, static struct merge_file_info merge_file(struct merge_options *o,
struct diff_filespec *one, const struct diff_filespec *one,
struct diff_filespec *a, const struct diff_filespec *a,
struct diff_filespec *b, const struct diff_filespec *b,
const char *branch1, const char *branch1,
const char *branch2) const char *branch2)
{ {