line-log: suppress diff output with "-s"
When "-L" is in use, we ignore any diff output format that the user provides to us, and just always print a patch (with extra context lines covering the whole area of interest). It's not entirely clear what we should do with all formats (e.g., should "--stat" show just the diffstat of the touched lines, or the stat for the whole file?). But "-s" is pretty clear: the user probably wants to see just the commits that touched those lines, without any diff at all. Let's at least make that work. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 7, 2019 at 14:45 UTC
9f607cd09c4c953d76de4bd18ba1c9bf6cf383cd
2 files changed
+11
-2
line-log.c
+4
-2
@@ -1103,10 +1103,12 @@ static int process_all_files(struct line_log_data **range_out,
1103
1104
int line_log_print(struct rev_info *rev, struct commit *commit)
1105
{
1106
- struct line_log_data *range = lookup_line_range(rev, commit);
1106
1107
show_log(rev);
1109
- dump_diff_hacky(rev, range);
1108
+ if (!(rev->diffopt.output_format & DIFF_FORMAT_NO_OUTPUT)) {
1109
+ struct line_log_data *range = lookup_line_range(rev, commit);
1110
+ dump_diff_hacky(rev, range);
1111
+ }
1112
return 1;
1113
}
1114
t/t4211-line-log.sh
+7
@@ -115,4 +115,11 @@ test_expect_success 'range_set_union' '
115
git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
116
'
117
118
+test_expect_success '-s shows only line-log commits' '
119
+ git log --format="commit %s" -L1,24:b.c >expect.raw &&
120
+ grep ^commit expect.raw >expect &&
121
+ git log --format="commit %s" -L1,24:b.c -s >actual &&
122
+ test_cmp expect actual
123
+'
124
+
125
test_done