On Tue, Mar 25, 2014 at 08:52:13PM +0700, Duy Nguyen wrote:
> On Mon, Mar 24, 2014 at 9:52 PM, Torsten Bögershausen <tbo...@web.de> wrote:
> > Did I report that t1501 fails when there is a softlink in $PWD ?
> > /home/tb/projects is a softlink to /disc5/projects/
>
> Yes you did and I forgot. I have fixed it, running test suite and will
> send the reroll soon.
Junio, it seems you have picked up all minor changes after
v5. Resending the whole series for one fix seems overkill. Could you
just --autosquash this one in?
-- 8< --
Subject: [PATCH] fixup! setup.c: support multi-checkout repo setup
---
t/t1501-worktree.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 2ac4424..e6ac7a4 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -359,7 +359,7 @@ test_expect_success 'GIT_DIR set (1)' '
(
cd work &&
GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
- echo "$TRASH_DIRECTORY/repo.git" >expect &&
+ test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
test_cmp expect actual
)
'
@@ -370,7 +370,7 @@ test_expect_success 'GIT_DIR set (2)' '
(
cd work &&
GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
- echo "$TRASH_DIRECTORY/repo.git" >expect &&
+ test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
test_cmp expect actual
)
'
@@ -381,7 +381,7 @@ test_expect_success 'Auto discovery' '
(
cd work &&
git rev-parse --git-common-dir >actual &&
- echo "$TRASH_DIRECTORY/repo.git" >expect &&
+ test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
test_cmp expect actual &&
echo haha >data1 &&
git add data1 &&
@@ -399,7 +399,7 @@ test_expect_success '$GIT_DIR/common overrides
core.worktree' '
(
cd work &&
git rev-parse --git-common-dir >actual &&
- echo "$TRASH_DIRECTORY/repo.git" >expect &&
+ test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
test_cmp expect actual &&
echo haha >data2 &&
git add data2 &&
--
1.9.1.345.ga1a145c
-- 8< --
--
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
