git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: gitster@pobox.com, git@vger.kernel.org, matled@gmx.net
Subject: [PATCH 8/9] Fix t1501 for updated work-tree logic
Date: Mon, 30 Jul 2007 00:26:22 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0707300026030.14781@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0707300016470.14781@racer.site>


t1501 is still a PITA to debug.  But I decided not to change it, so
that it is easier to see what the differences in the logic are.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1501-worktree.sh |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index aadeeab..7322161 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -33,17 +33,17 @@ mv .git repo.git || exit 1
 
 say "core.worktree = relative path"
 export GIT_DIR=repo.git
-export GIT_CONFIG=$GIT_DIR/config
+export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
 unset GIT_WORK_TREE
 git config core.worktree ../work
 test_rev_parse 'outside'      false false false
 cd work || exit 1
 export GIT_DIR=../repo.git
-export GIT_CONFIG=$GIT_DIR/config
+export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
 test_rev_parse 'inside'       false false true ''
 cd sub/dir || exit 1
 export GIT_DIR=../../../repo.git
-export GIT_CONFIG=$GIT_DIR/config
+export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
 test_rev_parse 'subdirectory' false false true sub/dir/
 cd ../../.. || exit 1
 
@@ -84,9 +84,23 @@ test_rev_parse 'in repo.git'              false true  false
 cd objects || exit 1
 test_rev_parse 'in repo.git/objects'      false true  false
 cd ../work || exit 1
-test_rev_parse 'in repo.git/work'         false false true ''
+test_rev_parse 'in repo.git/work'         false true true ''
 cd sub/dir || exit 1
-test_rev_parse 'in repo.git/sub/dir' false false true sub/dir/
+test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/
 cd ../../../.. || exit 1
 
+test_expect_success 'repo finds its work tree' '
+	(cd repo.git &&
+	 : > work/sub/dir/untracked &&
+	 test sub/dir/untracked = "$(git ls-files --others)")
+'
+
+test_expect_success 'repo finds its work tree from work tree, too' '
+	(cd repo.git/work/sub/dir &&
+	 : > tracked &&
+	 git --git-dir=../../.. add tracked &&
+	 cd ../../.. &&
+	 test sub/dir/tracked = "$(git ls-files)")
+'
+
 test_done
-- 
1.5.3.rc3.28.g1406

  parent reply	other threads:[~2007-07-29 23:26 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-29 23:23 [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-07-29 23:24 ` [PATCH 1/9] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-07-29 23:24 ` [PATCH 2/9] Add functions get_relative_cwd() and is_inside_dir() Johannes Schindelin
2007-07-29 23:24 ` [PATCH 3/9] white space fixes in setup.c Johannes Schindelin
2007-07-29 23:25 ` [PATCH 4/9] Clean up work-tree handling Johannes Schindelin
2007-07-29 23:25 ` [PATCH 5/9] Add set_git_dir() function Johannes Schindelin
2007-07-29 23:25 ` [PATCH 6/9] work-trees are allowed inside a git-dir Johannes Schindelin
2007-07-29 23:25 ` [PATCH 7/9] init: use get_git_work_tree() instead of rolling our own Johannes Schindelin
2007-07-29 23:26 ` Johannes Schindelin [this message]
2007-07-29 23:26 ` [PATCH 9/9] Fix t1500 for sane work-tree behavior Johannes Schindelin
2007-07-29 23:29 ` [UNWANTED PATCH] Die if core.bare = true and core.worktree is set Johannes Schindelin
2007-08-01  0:28 ` [PATCH 0/9] work-tree clean ups Johannes Schindelin
2007-08-01  0:28   ` [PATCH 1/4] Add is_absolute_path() and make_absolute_path() Johannes Schindelin
2007-08-01  0:29   ` [PATCH 2/4] Add functions get_relative_cwd() and is_inside_dir() Johannes Schindelin
2007-08-01  4:22     ` Junio C Hamano
2007-08-01  5:35       ` Junio C Hamano
2007-08-01 11:38         ` Johannes Schindelin
2007-08-01 15:26         ` [NOT-SERIOUS PATCH] Make get_relative_cwd() not accept NULL for a directory Johannes Schindelin
2007-08-01 16:58           ` Junio C Hamano
2007-08-01 18:26             ` [PATCH] get_relative_cwd(): clarify why it handles dir == NULL Johannes Schindelin
2007-08-01  0:29   ` [PATCH 3/4] Add set_git_dir() function Johannes Schindelin
2007-08-01  0:30   ` [PATCH 4/4] Clean up work-tree handling Johannes Schindelin
2007-08-01  5:17     ` Junio C Hamano
2007-08-01 11:46       ` Johannes Schindelin
2007-08-02  7:04         ` Junio C Hamano
2007-08-01  8:59     ` Junio C Hamano
2007-08-01 11:53       ` Johannes Schindelin
2007-08-01  0:55   ` [PATCH 0/9] work-tree clean ups Junio C Hamano
2007-08-01  1:13     ` Johannes Schindelin
2007-08-01 10:56       ` Johannes Schindelin

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=Pine.LNX.4.64.0707300026030.14781@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=matled@gmx.net \
    /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).