Merge branch 'maint'

[git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index 0f43d2ec78555339cfb788bc173780acdaa2139d..99e33b3651a3c0d7e89144712d3754eab8ad30d6 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -89,7 +89,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
                rev->always_show_header = 0;
        if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
                rev->always_show_header = 0;
-               if (rev->diffopt.nr_paths != 1)
+               if (rev->diffopt.pathspec.nr != 1)
                        usage("git logs can only follow renames on one pathname at a time");
        }
        for (i = 1; i < argc; i++) {