git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Sven Strickroth <email@cs-ware.de>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
	git@vger.kernel.org, peff@peff.net, johannes.schindelin@gmx.de
Subject: Re: [PATCH v2] MSVC: Unbreak real_path for Windows paths
Date: Tue, 09 Apr 2019 20:45:28 +0900	[thread overview]
Message-ID: <xmqqzhoz4d2f.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <31485f76-13a9-ec3b-16b9-78864490164d@cs-ware.de> (Sven Strickroth's message of "Mon, 8 Apr 2019 13:26:16 +0200")

Sven Strickroth <email@cs-ware.de> writes:

> A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't
> resolved correctly any more, because the *nix variant of offset_1st_component
> is used instead of the Win32 specific version.
>
> Regression was introduced in commit 1cadad6f6 when mingw_offset_1st_component
> was moved from mingw.c which is included by msvc.c to a separate file. Then,
> the new file "compat/win32/path-utils.h" was only included for the __CYGWIN__
> and __MINGW32__ cases in git-compat-util.h, the case for _MSC_VER was missing.
>
> Signed-off-by: Sven Strickroth <email@cs-ware.de>
> ---
>  config.mak.uname  | 1 +
>  git-compat-util.h | 1 +
>  2 files changed, 2 insertions(+)

Some context lines in config.mak.uname did not match tips of any of
the well-known branches I tried, and the blob object name recorded
on the "index" line was not useful, either, so I ended up applying
the patch by hand.  I do not think I screwed up a simple two-liner
patch like this too badly ;-), but please keep an eye on what will
appear on 'pu' and holler if I did, so we can correct it before it
hits 'master'.

Thanks.

>
> diff --git a/config.mak.uname b/config.mak.uname
> index 32381f5fd1..eb1428858c 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -426,6 +426,7 @@ ifeq ($(uname_S),Windows)
>  	CFLAGS =
>  	BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE


  reply	other threads:[~2019-04-09 11:45 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-08 11:16 [PATCH] Unbreak real_path on Windows for already absolute paths (with Visual Studio) Sven Strickroth
2019-04-09  2:36 ` Taylor Blau
2019-04-09  5:53 ` Torsten Bögershausen
2019-04-09  7:34   ` Sven Strickroth
2019-04-08 11:26     ` [PATCH v2] MSVC: Unbreak real_path for Windows paths Sven Strickroth
2019-04-09 11:45       ` Junio C Hamano [this message]
2019-04-09 16:19     ` [PATCH] Unbreak real_path on Windows for already absolute paths (with Visual Studio) Torsten Bögershausen
2019-04-09 16:46       ` Junio C Hamano
2019-04-10  5:32         ` Torsten Bögershausen
2019-04-12  1: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

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

  git send-email \
    --in-reply-to=xmqqzhoz4d2f.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=email@cs-ware.de \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=peff@peff.net \
    --cc=tboegi@web.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).