pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}

diff --git a/builtin/clone.c b/builtin/clone.c
index 8d23a62e8a1b875f1415f78a4c283f4cdefac011..a0f5bb9f450dc44745ccded86fe5ad3f8cd8758e 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -18,7 +18,6 @@
 #include "transport.h"
 #include "strbuf.h"
 #include "dir.h"
-#include "pack-refs.h"
 #include "sigchain.h"
 #include "branch.h"
 #include "remote.h"
@@ -704,6 +703,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;
        }