diff options
| -rw-r--r-- | revision.c | 4 | ||||
| -rwxr-xr-x | t/t4211-line-log.sh | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 162d511d46..fc4f33fdd5 100644 --- a/revision.c +++ b/revision.c @@ -2683,6 +2683,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->first_parent_only && revs->bisect) die(_("--first-parent is incompatible with --bisect")); + if (revs->line_level_traverse && + (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT))) + die(_("-L does not yet support diff formats besides -p and -s")); + if (revs->expand_tabs_in_log < 0) revs->expand_tabs_in_log = revs->expand_tabs_in_log_default; diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index c9f2036f68..1db7bd0f59 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -122,4 +122,14 @@ test_expect_success '-s shows only line-log commits' ' test_cmp expect actual ' +test_expect_success '-p shows the default patch output' ' + git log -L1,24:b.c >expect && + git log -L1,24:b.c -p >actual && + test_cmp expect actual +' + +test_expect_success '--raw is forbidden' ' + test_must_fail git log -L1,24:b.c --raw +' + test_done |