On Tue, 16 Aug 2005, Junio C Hamano wrote:
> 
> Merged, pushed out, and tested.  Ouch.  Fails on t0000 test.

It's because the new git-diff-files expects there to be a valid readable 
.git/HEAD, and is unhappy since the test hasn't updated HEAD.

This trivial patch fixes it.

                Linus
----
Fix test failure due to overly strict .git directory tests

We may not actually have a valid HEAD at all times, so relax the validity 
tests for a .git subdirectory accordingly.

Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
-----
diff --git a/setup.c b/setup.c
--- a/setup.c
+++ b/setup.c
@@ -81,10 +81,9 @@ const char *setup_git_directory(void)
        offset = len = strlen(cwd);
        for (;;) {
                /*
-                * We always want to see a .git/HEAD and a .git/refs/
-                * subdirectory
+                * We always want to see a .git/refs/ subdirectory
                 */
-               if (!access(".git/HEAD", R_OK) && !access(".git/refs/", X_OK)) {
+               if (!access(".git/refs/", X_OK)) {
                        /*
                         * Then we need either a GIT_OBJECT_DIRECTORY define
                         * or a .git/objects/ directory
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to