Merge branch 'bg/xcalloc-nmemb-then-size' into maint

diff --git a/diff.c b/diff.c
index 146521e1947e36d010524dece848bfb03edfac24..3f1f08f9fd28173e10440c8436d57c14215c342c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3325,6 +3325,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)