Merge branch 'al/t3200-back-on-a-branch'

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

diff --git a/range-diff.c b/range-diff.c
index 3a0eb70c897a2156e0fa9d951241e3bb8e8f6ef6..24dc435e482c0364ebc88e7ad55930f437d73ad2 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -52,22 +52,22 @@ static int read_patches(const char *range, struct string_list *list,
        size_t size;
 
        strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
-                       "--reverse", "--date-order", "--decorate=no",
-                       "--no-prefix",
-                       /*
-                        * Choose indicators that are not used anywhere
-                        * else in diffs, but still look reasonable
-                        * (e.g. will not be confusing when debugging)
-                        */
-                       "--output-indicator-new=>",
-                       "--output-indicator-old=<",
-                       "--output-indicator-context=#",
-                       "--no-abbrev-commit",
-                       "--pretty=medium",
-                       "--notes",
-                       NULL);
+                    "--reverse", "--date-order", "--decorate=no",
+                    "--no-prefix",
+                    /*
+                     * Choose indicators that are not used anywhere
+                     * else in diffs, but still look reasonable
+                     * (e.g. will not be confusing when debugging)
+                     */
+                    "--output-indicator-new=>",
+                    "--output-indicator-old=<",
+                    "--output-indicator-context=#",
+                    "--no-abbrev-commit",
+                    "--pretty=medium",
+                    "--notes",
+                    NULL);
        if (other_arg)
-               strvec_pushv(&cp.args, other_arg->argv);
+               strvec_pushv(&cp.args, other_arg->v);
        strvec_push(&cp.args, range);
        cp.out = -1;
        cp.no_stdin = 1;