Merge branch 'jk/shortlog-ident-cleanup' into next

diff --git a/revision.c b/revision.c
index d100b3a3beb61ffd359c3eea997cf8c64b275740..f9a90d71d2008415e80b30c9e5d3b2743af5438f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -19,6 +19,7 @@
 #include "dir.h"
 #include "cache-tree.h"
 #include "bisect.h"
+#include "packfile.h"
 #include "worktree.h"
 
 volatile show_early_output_fn_t show_early_output;
@@ -2251,6 +2252,8 @@ static int handle_revision_pseudo_opt(const char *submodule,
                        return error("invalid argument to --no-walk");
        } else if (!strcmp(arg, "--do-walk")) {
                revs->no_walk = 0;
+       } else if (!strcmp(arg, "--single-worktree")) {
+               revs->single_worktree = 1;
        } else {
                return 0;
        }