Skip to content

Commit

Permalink
log -L: improve comments in process_all_files()
Browse files Browse the repository at this point in the history
The funny range assignment in process_all_files() had me sidetracked
while investigating what led to the previous commit.  Let's improve
the comments.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Thomas Rast authored and Junio C Hamano committed Apr 12, 2013
1 parent 31c6191 commit 1ddac3f
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions line-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -1095,11 +1095,24 @@ static int process_all_files(struct line_log_data **range_out,

for (i = 0; i < queue->nr; i++) {
struct diff_ranges *pairdiff = NULL;
if (process_diff_filepair(rev, queue->queue[i], *range_out, &pairdiff)) {
struct diff_filepair *pair = queue->queue[i];
if (process_diff_filepair(rev, pair, *range_out, &pairdiff)) {
/*
* Store away the diff for later output. We
* tuck it in the ranges we got as _input_,
* since that's the commit that caused the
* diff.
*
* NEEDSWORK not enough when we get around to
* doing something interesting with merges;
* currently each invocation on a merge parent
* trashes the previous one's diff.
*
* NEEDSWORK tramples over data structures not owned here
*/
struct line_log_data *rg = range;
changed++;
/* NEEDSWORK tramples over data structures not owned here */
while (rg && strcmp(rg->path, queue->queue[i]->two->path))
while (rg && strcmp(rg->path, pair->two->path))
rg = rg->next;
assert(rg);
rg->pair = diff_filepair_dup(queue->queue[i]);
Expand Down

0 comments on commit 1ddac3f

Please sign in to comment.