Jakub Narebski <jnareb@xxxxxxxxx> writes:
> Do I understand code correctly, and the last '+' or '-'
> in the parents column means?
>
> for (i = 0; i < ecbdata->nparents && len; i++) {
> if (line[i] == '-')
> color = DIFF_FILE_OLD;
> else if (line[i] == '+')
> color = DIFF_FILE_NEW;
> }
>
> Anyone who wrote this code, could you answer me, please?
The "up to ecbdata->nparents" is Johannes in cd112ce. But you
are looking at a wrong code, I am afraid, if your original
question was about the combined format (there is a comment about
the codepath dealing only with two-way diffs by Johannes, above
the part you quoted). The output for combined diff is coming
from combine-diff.c:dump_sline().
Combined diff output logic pretty much guarantees that you never
will see plus and minus on the same line.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html