From: Jens Lehmann <Jens.Lehmann@web.de>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Manlio Perillo <manlio.perillo@gmail.com>,
"W. Trevor King" <wking@drexel.edu>
Subject: Re: [PATCH] clone: forbid --bare --separate-git-dir <dir>
Date: Tue, 08 Jan 2013 18:15:41 +0100 [thread overview]
Message-ID: <50EC543D.5090100@web.de> (raw)
In-Reply-To: <20130108141650.GA18637@lanh>
Am 08.01.2013 15:16, schrieb Duy Nguyen:
> On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote:
>> Unfortunately we forgot to forbid the --bare
>> --separate-git-dir combination. In practice, we know no one
>> could be using --bare with --separate-git-dir because it is
>> broken in the following way: <explanation here>. So it is
>> safe to make good on our mistake and forbid the combination,
>> making the command easier to explain.
>>
>> I don't know what would go in the <explanation here> blank above,
>> though. Is it possible that some people are relying on this option
>> combination?
>
> I can't say it's broken in what way. Maybe it's easier to just support
> this case, it's not much work anyway. Jens, maybe squash this to your
> original patch?
I'd be fine with that, though my gut feeling is that this should
be a patch of its own (My patch handles the git dir, your's handles
a work tree issue). But I don't care much either way, what do others
think?
> -- 8< --
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 8d23a62..c8b09ad 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -375,6 +375,7 @@ static void clone_local(const char *src_repo, const char *dest_repo)
>
> static const char *junk_work_tree;
> static const char *junk_git_dir;
> +static const char *junk_git_file;
> static pid_t junk_pid;
>
> static void remove_junk(void)
> @@ -392,6 +393,8 @@ static void remove_junk(void)
> remove_dir_recursively(&sb, 0);
> strbuf_reset(&sb);
> }
> + if (junk_git_file)
> + unlink(junk_git_file);
> }
>
> static void remove_junk_on_signal(int signo)
> @@ -772,6 +775,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
>
> set_git_dir_init(git_dir, real_git_dir, 0);
> if (real_git_dir) {
> + if (option_bare)
> + junk_git_file = git_dir;
> git_dir = real_git_dir;
> junk_git_dir = real_git_dir;
> }
> diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
> index 4435693..231bc8a 100755
> --- a/t/t5600-clone-fail-cleanup.sh
> +++ b/t/t5600-clone-fail-cleanup.sh
> @@ -49,4 +49,14 @@ test_expect_success 'failed clone --separate-git-dir should not leave any direct
> rmdir foo/.git/objects.bak
> '
>
> +test_expect_success 'failed clone --separate-git-dir --bare should not leave any directories' '
> + mkdir foo/.git/objects.bak/ &&
> + mv foo/.git/objects/* foo/.git/objects.bak/ &&
> + test_must_fail git clone --bare --separate-git-dir gitdir foo baaar &&
> + test_must_fail test -e gitdir &&
> + test_must_fail test -e baaar &&
> + mv foo/.git/objects.bak/* foo/.git/objects/ &&
> + rmdir foo/.git/objects.bak
> +'
> +
> test_done
> -- 8< --
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2013-01-08 17:17 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 [this message]
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 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2013-01-11 3:15 ` 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=50EC543D.5090100@web.de \
--to=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=pclouds@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).