Merge branch 'jk/diff-follow-must-take-one-pathspec'

diff --git a/diff.c b/diff.c
index f66716fab4b477c58434126b4aaa4b4372ce163a..de25819e4edede0a24ee30b202dee478165b4fed 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3320,6 +3320,9 @@ void diff_setup_done(struct diff_options *options)
        }
 
        options->diff_path_counter = 0;
+
+       if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
+               die(_("--follow requires exactly one pathspec"));
 }
 
 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)