Re: t0008-ignores failure (was: [msysGit] Git for Windows 1.8.3)
Hi Karsten,
On Thu, 30 May 2013, Karsten Blees wrote:
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test failures:
t0008-ignores.sh 155, 158, 162, 164
These tests fail because they use absolute paths, e.g.
C:/.../global-excludes, which is then translated to
CNUL/.../global-excludes. Can be fixed like so:
--- 8 ---
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -5,7 +5,7 @@ test_description=check-ignore
. ./test-lib.sh
init_vars () {
- global_excludes=$(pwd)/global-excludes
+ global_excludes=global-excludes
}
enable_global_excludes () {
---
Since I do not have time for the lengthy, undirected discussion upstream
seems to want to start, let's make your change, but only conditional on
MINGW?
Ciao,
Dscho
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: t0008-ignores failure (was: [msysGit] Git for Windows 1.8.3)
On 30 May 2013 16:15, Johannes Schindelin johannes.schinde...@gmx.de wrote:
Hi Karsten,
On Thu, 30 May 2013, Karsten Blees wrote:
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test failures:
t0008-ignores.sh 155, 158, 162, 164
These tests fail because they use absolute paths, e.g.
C:/.../global-excludes, which is then translated to
CNUL/.../global-excludes. Can be fixed like so:
--- 8 ---
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -5,7 +5,7 @@ test_description=check-ignore
. ./test-lib.sh
init_vars () {
- global_excludes=$(pwd)/global-excludes
+ global_excludes=global-excludes
}
enable_global_excludes () {
---
Since I do not have time for the lengthy, undirected discussion upstream
seems to want to start, let's make your change, but only conditional on
MINGW?
Ciao,
Dscho
I was just testing this -- I've already wrapped the suggested fix
within a test_have_prereq MINGW for our fork and committed it. This
was an issue partly because was alias pwd to pwd -W and so always
get Windows paths. It means the test here doesn't check absolute paths
but I think we can live with that. I tried using $(builtin pwd) to
avoid the -W but it didn't help and I still got C: style paths.
I also grabbed Karsten's patch dir.c: fix ignore processing within
not-ignored directories as this appears to deal with a .gitignore
regression in 1.8.3. We can carry this until the next merge with
upstream.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: t0008-ignores failure (was: [msysGit] Git for Windows 1.8.3)
Hi Pat,
On Thu, 30 May 2013, Pat Thoyts wrote:
On 30 May 2013 16:15, Johannes Schindelin johannes.schinde...@gmx.de wrote:
On Thu, 30 May 2013, Karsten Blees wrote:
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test failures:
t0008-ignores.sh 155, 158, 162, 164
These tests fail because they use absolute paths, e.g.
C:/.../global-excludes, which is then translated to
CNUL/.../global-excludes. Can be fixed like so:
--- 8 ---
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -5,7 +5,7 @@ test_description=check-ignore
. ./test-lib.sh
init_vars () {
- global_excludes=$(pwd)/global-excludes
+ global_excludes=global-excludes
}
enable_global_excludes () {
---
Since I do not have time for the lengthy, undirected discussion upstream
seems to want to start, let's make your change, but only conditional on
MINGW?
I was just testing this -- I've already wrapped the suggested fix
within a test_have_prereq MINGW for our fork and committed it. This
was an issue partly because was alias pwd to pwd -W and so always
get Windows paths. It means the test here doesn't check absolute paths
but I think we can live with that. I tried using $(builtin pwd) to
avoid the -W but it didn't help and I still got C: style paths.
I also grabbed Karsten's patch dir.c: fix ignore processing within
not-ignored directories as this appears to deal with a .gitignore
regression in 1.8.3. We can carry this until the next merge with
upstream.
Thanks!
Dscho
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
t0008-ignores failure (was: [msysGit] Git for Windows 1.8.3)
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test failures:
t0008-ignores.sh 155, 158, 162, 164
These tests fail because they use absolute paths, e.g.
C:/.../global-excludes, which is then translated to
CNUL/.../global-excludes. Can be fixed like so:
--- 8 ---
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -5,7 +5,7 @@ test_description=check-ignore
. ./test-lib.sh
init_vars () {
- global_excludes=$(pwd)/global-excludes
+ global_excludes=global-excludes
}
enable_global_excludes () {
---
However, this raises the question whether colon is such a good choice as
separator in 'git-check-ignore --verbose' output.
':' conflicts at least with Windows absolute paths and ADS names, and also with
URLs (in case someone finds 'git ls-files
--exclude-from=http://git-tricks.foo/special-exclude-file' useful enough to
implement :-)
I realize colon was chosen to mimic git-check-attr, however, check-attr prints
relative paths only (I think?).
How about using TAB or '|' instead? AFAICT, these are typically not used in
paths or glob patterns.
Cheers,
Karsten
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
