Sync with maint

[thirdparty/git.git] / range-diff.c

diff --git a/range-diff.c b/range-diff.c
index f56b4012a284831bd2edefeed141ca8717d219b6..f745567cf6719665cdfd23145335380f36e0c54b 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -41,7 +41,7 @@ static size_t find_end_of_line(char *buffer, unsigned long size)
  * as struct object_id (will need to be free()d).
  */
 static int read_patches(const char *range, struct string_list *list,
-                       struct argv_array *other_arg)
+                       const struct argv_array *other_arg)
 {
        struct child_process cp = CHILD_PROCESS_INIT;
        struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
@@ -506,8 +506,8 @@ static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
 
 int show_range_diff(const char *range1, const char *range2,
                    int creation_factor, int dual_color,
-                   struct diff_options *diffopt,
-                   struct argv_array *other_arg)
+                   const struct diff_options *diffopt,
+                   const struct argv_array *other_arg)
 {
        int res = 0;