Merge branch 'tk/doc-filter-branch' into maint-1.8.1

diff --git a/builtin/clone.c b/builtin/clone.c
index 8d23a62e8a1b875f1415f78a4c283f4cdefac011..36ec99db3f5a7dbd59705aa68bcd592c08c773cd 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -704,6 +704,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                if (option_origin)
                        die(_("--bare and --origin %s options are incompatible."),
                            option_origin);
+               if (real_git_dir)
+                       die(_("--bare and --separate-git-dir are incompatible."));
                option_no_checkout = 1;
        }