Re: [PATCH 1/2] test-path-utils.c: remove incorrect assumption
- From
Ray Donnelly <mingw.android@gmail.com>
- Date
- Oct 3, 2015, 15:38 UTC
- Message-ID
- <CAOYw7dvYvgXWNi=kFdB0kXP0BjGTmcY-dG6mkaKU93LdV4i5HQ@mail.gmail.com>
- In-Reply-To
- <CAOYw7dubGJ=m5+EnjGy7jTQxR+b0uBmyG138KEQ5rzX2K7WcgA@mail.gmail.com>
I'm going to have to attach this as a file, git-send-email isn't working for me; apologies.
On Sat, Oct 3, 2015 at 1:44 PM, Ray Donnelly <mingw.android@gmail.com> wrote:
Show 41 quoted lines
> In normalize_ceiling_entry(), we test that normalized paths end with
> slash, *unless* the path to be normalized was already the root
> directory.
>
> However, normalize_path_copy() does not even enforce this condition.
>
> Even worse: on Windows, the root directory gets translated into a
> Windows directory by the Bash before being passed to `git.exe` (or
> `test-path-utils.exe`), which means that we cannot even know whether
> the path that was passed to us was the root directory to begin with.
>
> This issue has already caused endless hours of trying to "fix" the
> MSYS2 runtime, only to break other things due to MSYS2 ensuring that
> the converted path maintains the same state as the input path with
> respect to any final '/'.
>
> So let's just forget about this test. It is non-essential to Git's
> operation, anyway.
>
> Ack-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
> ---
> test-path-utils.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/test-path-utils.c b/test-path-utils.c
> index 3dd3744..c67bf65 100644
> --- a/test-path-utils.c
> +++ b/test-path-utils.c
> @@ -21,8 +21,6 @@ static int normalize_ceiling_entry(struct
> string_list_item *item, void *unused)
> if (normalize_path_copy(buf, ceil) < 0)
> die("Path \"%s\" could not be normalized", ceil);
> len = strlen(buf);
> - if (len > 1 && buf[len-1] == '/')
> - die("Normalized path \"%s\" ended with slash", buf);
> free(item->string);
> item->string = xstrdup(buf);
> return 1;
> --
> 2.5.2From 3deea12dd8506f88fdaeabcc33683f81b75a13fa Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Thu, 1 Oct 2015 20:04:17 +0100 Subject: [PATCH 1/2] test-path-utils.c: remove incorrect assumption
In normalize_ceiling_entry(), we test that normalized paths end with slash, *unless* the path to be normalized was already the root directory.
However, normalize_path_copy() does not even enforce this condition.
Even worse: on Windows, the root directory gets translated into a Windows directory by the Bash before being passed to `git.exe` (or `test-path-utils.exe`), which means that we cannot even know whether the path that was passed to us was the root directory to begin with.
This issue has already caused endless hours of trying to "fix" the MSYS2 runtime, only to break other things due to MSYS2 ensuring that the converted path maintains the same state as the input path with respect to any final '/'.
So let's just forget about this test. It is non-essential to Git's operation, anyway.
Ack-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Ray Donnelly <mingw.android@gmail.com> --- test-path-utils.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/test-path-utils.c b/test-path-utils.c index 3dd3744..c67bf65 100644 --- a/test-path-utils.c +++ b/test-path-utils.c @@ -21,8 +21,6 @@ static int normalize_ceiling_entry(struct string_list_item *item, void *unused) if (normalize_path_copy(buf, ceil) < 0) die("Path \"%s\" could not be normalized", ceil); len = strlen(buf); - if (len > 1 && buf[len-1] == '/') - die("Normalized path \"%s\" ended with slash", buf); free(item->string); item->string = xstrdup(buf); return 1;
-- 2.5.2