On Fri, Dec 16, 2016 at 10:54:13AM -0800, Junio C Hamano wrote:
> I am tempted to suggest an intermediate step that comes before
> b1ef400eec ("setup_git_env: avoid blind fall-back to ".git"",
> 2016-10-20), which is the attached, and publish that as part of an
> official release. That way, we'll see what is broken without
> hurting people too much (unless they or their scripts care about
> extra message given to the standard error stream). I suspect that
> released Git has a slightly larger user base than what is cooked on
> 'next'.
>
> environment.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/environment.c b/environment.c
> index 0935ec696e..88f857331e 100644
> --- a/environment.c
> +++ b/environment.c
> @@ -167,8 +167,11 @@ static void setup_git_env(void)
> const char *replace_ref_base;
>
> git_dir = getenv(GIT_DIR_ENVIRONMENT);
> - if (!git_dir)
> + if (!git_dir) {
> + if (!startup_info->have_repository)
> + warning("BUG: please report this at git@xxxxxxxxxxxxxxx");
> git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
> + }
Yes, I think this is a nice way to ease into the change. I wish I had
thought of it when doing the original series, and we could have shipped
it in v2.11. :)
-Peff