Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: > I just verified that the combination of your two suggestions (i.e., the > patch below) fixes the problem for me. Good to know. The only remaining two worries from me are if everybody has working pwd at that early point in the script (I think MINGW replaces pwd with its own), and if the latter one should really be "/bin/pwd" everywhere. Saying "Give the true path to --root when you run it" can sidestep the latter issue ;-) > Nevertheless, I'm not sure that this is the best solution. The test > failures that occur without this change suggest to me that > GIT_CEILING_DIRECTORIES is implemented in a fragile way. Hrmph. How would you improve it? chdir() around twice and compare? > diff --git a/t/test-lib.sh b/t/test-lib.sh > index bb4f886..c7f320f 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -15,6 +15,8 @@ > # You should have received a copy of the GNU General Public License > # along with this program. If not, see http://www.gnu.org/licenses/ . > > +cd "$(pwd -P)" > + > # if --tee was passed, write the output not only to the terminal, but > # additionally to the file test-results/$BASENAME.out, too. > case "$GIT_TEST_TEE_STARTED, $* " in > @@ -166,6 +168,7 @@ do > shift ;; # was handled already > --root=*) > root=$(expr "z$1" : 'z[^=]*=\(.*\)') > + root=$(cd "$root" && /bin/pwd) > shift ;; > *) > echo "error: unknown test option '$1'" >&2; exit 1 ;; -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html