Merge branch 'nd/clone-no-separate-git-dir-with-bare'

gitster · gitster · commit 68434e287988 · 2013-01-21T20:15:08.000-08:00
Forbid a useless combination of options to "git clone".

* nd/clone-no-separate-git-dir-with-bare:
  clone: forbid --bare --separate-git-dir &lt;dir&gt;
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -704,6 +704,8 @@ int cmd_clone(int argc, const char *argv, const char prefix)`
`704`	`704`	`if (option_origin)`
`705`	`705`	`die(_("--bare and --origin %s options are incompatible."),`
`706`	`706`	`option_origin);`
	`707`	`+ if (real_git_dir)`
	`708`	`+ die(_("--bare and --separate-git-dir are incompatible."));`
`707`	`709`	`option_no_checkout = 1;`
`708`	`710`	`}`
`709`	`711`