Re: [PATCH v9 3/5] Implement line-history search (git log -L)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 21, 2013, 19:05 UTC
- Message-ID
- <7vr4j8a7zy.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <b8cabd5ca63a17577fca524891046e5a3d3dfc60.1363865444.git.trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
Show 28 quoted lines
> +void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
> +{
> + struct commit *commit = NULL;
> + struct line_log_data *range;
> +
> + commit = check_single_commit(rev);
> + range = parse_lines(commit, prefix, args);
> + add_line_range(rev, commit, range);
> +
> + if (!rev->diffopt.detect_rename) {
> + int i, count = 0;
> + struct line_log_data *r = range;
> + const char **paths;
> + while (r) {
> + count++;
> + r = r->next;
> + }
> + paths = xmalloc((count+1)*sizeof(char *));
> + r = range;
> + for (i = 0; i < count; i++) {
> + paths[i] = xstrdup(r->spec->path);
> + r = r->next;
> + }
> + paths[count] = NULL;
> + init_pathspec(&rev->diffopt.pathspec, paths);
> + free(paths);
> + }
> +}Why not do the pathspec limitation under "-M"?
It is not like you are picking up origins of blocks of lines copied or moved from other files like "blame -C" does, so I suspect it would be simpler to mimic what --follow does, which is to (1) use the pathspec to follow the paths you care about, and then (2) when you find one or more of the paths you were following disappear in a commit, only at that point you re-check to see if there are other paths that existed in the parent that the disappeared paths were renamed from, and match with that one.