git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] git config: do not create .git/ if it does not exist yet
Date: Wed, 24 Feb 2016 03:26:57 -0500	[thread overview]
Message-ID: <20160224082657.GD12511@sigill.intra.peff.net> (raw)
In-Reply-To: <c4027d758b0914dbc2e1ff5df344b0669aac4447.1456299545.git.johannes.schindelin@gmx.de>

On Wed, Feb 24, 2016 at 08:47:00AM +0100, Johannes Schindelin wrote:

> It is a pilot error to call `git config section.key value` outside of
> any Git worktree.
> 
> Let's report that error instead of creating the .git/ directory and
> writing a fresh config into it.

Hmm.  I get (on my Linux machine):

  $ git config foo.bar baz
  error: could not lock config file .git/config: No such file or directory

which makes sense (though still isn't a great error message, and is kind
of weird if you happen to have a .git directory that isn't a real
repository).

Is Git more aggressive about auto-creating the directory for lockfiles
on Windows? I tried the exact recipe you gave in the linked thread, just
to be sure, but I couldn't replicate it.

> 	I cannot think of a way how to test this: all of the regression
> 	tests run inside Git's own worktree, and we cannot even assume
> 	that /tmp/ is outside of a worktree (or that it exists).

We could make the test conditional on whether we are in a repo. Anybody
who builds from a tarball, or who uses --root would then run the test.

Something like this:

-- >8 --
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 52678e7..9856831 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1201,4 +1201,13 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
 	  "die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
 '
 
+test_expect_success 'set up repo-less tests' '
+	mv .git tmp-git &&
+	{ git rev-parse --git-dir || test_set_prereq REPOLESS; }
+'
+
+test_expect_success REPOLESS 'cannot set repo config outside of a repo' '
+	test_must_fail git config foo.bar baz
+'
+
 test_done
-- 8< --

Though I admit it is pretty gross. It also pollutes the script state, so
anybody adding tests after will be in for a surprise. :)

One solution would be to restore "tmp-git" in the set-up, and then have
each REPOLESS test move it again, and put it back with a
test_when_finished. Or perhaps just make a new script for REPOLESS tests
(config or otherwise).

> diff --git a/builtin/config.c b/builtin/config.c
> index adc7727..78aab95 100644
> --- a/builtin/config.c
> +++ b/builtin/config.c
> @@ -352,6 +352,9 @@ static int get_colorbool(const char *var, int print)
>  
>  static void check_write(void)
>  {
> +	if (!given_config_source.file && !startup_info->have_repository)
> +		die("not in a git directory");
> +
>  	if (given_config_source.use_stdin)
>  		die("writing to stdin is not supported");

I think you'd want to cover "git config --local foo.bar baz" in the same
way. You can check use_local_config for that.

-Peff

  reply	other threads:[~2016-02-24  8:27 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-24  7:47 [PATCH] git config: do not create .git/ if it does not exist yet Johannes Schindelin
2016-02-24  8:26 ` Jeff King [this message]
2016-02-24 10:14   ` John Keeping
2016-02-24 10:31     ` Jeff King
2016-02-24 11:31       ` Johannes Schindelin
2016-02-24 12:13         ` Johannes Schindelin
2016-02-24 12:34           ` Jeff King
2016-02-24 18:45           ` Junio C Hamano
2016-02-24 11:01   ` Duy Nguyen
2016-02-24 12:48 ` [PATCH v2] git config: report when trying to modify a non-existing repo config Johannes Schindelin
2016-02-24 12:59   ` Duy Nguyen
2016-02-24 13:26     ` Johannes Schindelin
2016-02-24 13:29       ` Duy Nguyen
2016-02-24 20:11   ` Junio C Hamano
2016-02-24 22:31     ` Junio C Hamano
2016-02-25 15:54       ` Johannes Schindelin

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

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

  git send-email \
    --in-reply-to=20160224082657.GD12511@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /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.
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 NNTP newsgroup(s).