line-log: detect unsupported formats

diff --git a/revision.c b/revision.c
index 162d511d4686bc43f2032a57fa95e3601eb3d6b2..fc4f33fdd5345acb703433fd2d020627f49c2f78 100644 (file)
--- 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;