diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:23 +0900 |
| commit | 31df2c1019733ac22fc848aa2658a0e25af70a79 (patch) | |
| tree | c4924fdd7bc01bbf9a1027a340110286b9a45b13 /line-log.c | |
| parent | ac9e40e8ef796e43ae4438cbcd923bfa1056be61 (diff) | |
| parent | 05314efaeaa0ae7cb0aa26d6347eabfe7cd8fc43 (diff) | |
| download | git-31df2c1019733ac22fc848aa2658a0e25af70a79.tar.gz | |
Merge branch 'jk/line-log-with-patch'
"git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
output as it should. This has been corrected.
* jk/line-log-with-patch:
line-log: detect unsupported formats
line-log: suppress diff output with "-s"
Diffstat (limited to 'line-log.c')
| -rw-r--r-- | line-log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/line-log.c b/line-log.c index 24e21731c4..59248e37cc 100644 --- a/line-log.c +++ b/line-log.c @@ -1103,10 +1103,12 @@ static int process_all_files(struct line_log_data **range_out, int line_log_print(struct rev_info *rev, struct commit *commit) { - struct line_log_data *range = lookup_line_range(rev, commit); show_log(rev); - dump_diff_hacky(rev, range); + if (!(rev->diffopt.output_format & DIFF_FORMAT_NO_OUTPUT)) { + struct line_log_data *range = lookup_line_range(rev, commit); + dump_diff_hacky(rev, range); + } return 1; } |