git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: Jonathan Niedier <jrnieder@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
	"Jens Lehmann" <Jens.Lehmann@web.de>,
	"Heiko Voigt" <hvoigt@hvoigt.net>,
	"Manlio Perillo" <manlio.perillo@gmail.com>,
	"W. Trevor King" <wking@drexel.edu>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2] clone: forbid --bare --separate-git-dir <dir>
Date: Fri, 11 Jan 2013 10:09:59 +0700	[thread overview]
Message-ID: <1357873799-17413-1-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1357465670-32766-1-git-send-email-pclouds@gmail.com>

The --separate-git-dir option was introduced to make it simple to put
the git directory somewhere outside the worktree, for example when
cloning a repository for use as a submodule.

It was not intended for use when creating a bare repository. In that
case there is no worktree and it is more natural to directly clone the
repository and create a .git file as separate steps:

        git clone --bare /path/to/repo.git bar.git
        printf 'gitdir: bar.git\n' >foo.git

Forbid the combination, making the command easier to explain.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Just reword the commit message (or copying it from Jonathan
 actually). No comments about remove_junk_on_signal because we're less
 likely to re-enable it again.

 builtin/clone.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/builtin/clone.c b/builtin/clone.c
index ec2f75b..b30189f 100644
--- 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;
 	}
 
-- 
1.8.0.rc2.23.g1fb49df

  parent reply	other threads:[~2013-01-11  3:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-04 20:53 [BUG] git submodule update is not fail safe Manlio Perillo
2013-01-04 21:51 ` Junio C Hamano
2013-01-05 13:52   ` Manlio Perillo
2013-01-05 14:07     ` Jens Lehmann
2013-01-05 14:01   ` Jens Lehmann
2013-01-05 14:49     ` Manlio Perillo
2013-01-05 14:50     ` Jens Lehmann
2013-01-05 20:17       ` [PATCH] clone: support atomic operation with --separate-git-dir Jens Lehmann
2013-01-05 21:20         ` Manlio Perillo
2013-01-06  6:43         ` Junio C Hamano
2013-01-06  8:49           ` Duy Nguyen
2013-01-06  9:16             ` Jonathan Nieder
2013-01-06  9:47               ` [PATCH] clone: forbid --bare --separate-git-dir <dir> Nguyễn Thái Ngọc Duy
2013-01-06 10:19                 ` Jonathan Nieder
2013-01-06 23:13                   ` Junio C Hamano
2013-01-07  1:18                     ` Duy Nguyen
2013-01-07  2:04                       ` Junio C Hamano
2013-01-08 14:16                   ` Duy Nguyen
2013-01-08 17:15                     ` Jens Lehmann
2013-01-08 17:45                       ` Junio C Hamano
2013-01-08 23:34                         ` Duy Nguyen
2013-01-08 23:42                           ` Junio C Hamano
2013-01-11  3:09                 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-11  3:15                   ` [PATCH v2] " Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357873799-17413-1-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jrnieder@gmail.com \
    --cc=manlio.perillo@gmail.com \
    --cc=wking@drexel.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).