line-log: extract pathspec parsing from line ranges into a helper function

A helper function to parse the paths involved in the line ranges and
to turn them into a pathspec will be useful in the next patch.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/line-log.c b/line-log.c
index 0a17b21187b6620c3c5c82e53271d56bc0c6deb8..93f4e10f6525483b1f1ff26a0a07c835a1099837 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -736,6 +736,22 @@ static struct line_log_data *lookup_line_range(struct rev_info *revs,
        return ret;
 }
 
        return ret;
 }
 

+static void parse_pathspec_from_ranges(struct pathspec *pathspec,
+                                      struct line_log_data *range)
+{
+       struct line_log_data *r;
+       struct argv_array array = ARGV_ARRAY_INIT;
+       const char **paths;
+
+       for (r = range; r; r = r->next)
+               argv_array_push(&array, r->path);
+       paths = argv_array_detach(&array);
+
+       parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
+       /* strings are now owned by pathspec */
+       free(paths);
+}
+

 void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
 {
        struct commit *commit = NULL;
 void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
 {
        struct commit *commit = NULL;


@@ -745,20 +761,8 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
        range = parse_lines(rev->diffopt.repo, commit, prefix, args);
        add_line_range(rev, commit, range);
 
        range = parse_lines(rev->diffopt.repo, commit, prefix, args);
        add_line_range(rev, commit, range);
 

-       if (!rev->diffopt.detect_rename) {
-               struct line_log_data *r;
-               struct argv_array array = ARGV_ARRAY_INIT;
-               const char **paths;
-
-               for (r = range; r; r = r->next)
-                       argv_array_push(&array, r->path);
-               paths = argv_array_detach(&array);
-
-               parse_pathspec(&rev->diffopt.pathspec, 0,
-                              PATHSPEC_PREFER_FULL, "", paths);
-               /* strings are now owned by pathspec */
-               free(paths);
-       }
+       if (!rev->diffopt.detect_rename)
+               parse_pathspec_from_ranges(&rev->diffopt.pathspec, range);

 }
 
 static void move_diff_queue(struct diff_queue_struct *dst,
 }
 
 static void move_diff_queue(struct diff_queue_struct *dst,