Additional GIT_DIR support bugfixes. May actually work now.

Two fixes. First, and most importantly, relax the isLinkToAnnex check
to only look for /annex/objects/, not [^|/].git/annex/objects. If
GIT_DIR is used with a detached work tree, the git directory is
not necessarily named .git.

There are important caveats with doing that at all, since git-annex will
make symlinks that point at GIT_DIR, which means that the relative path
between GIT_DIR and GIT_WORK_TREE needs to remain stable across all clones
of the repository.

----

The other fix is just fixing crazy and wrong code that, when GIT_DIR is
set, expects to still find a git repository in the path below the work
tree, and uses some of its configuration, and some of GIT_DIR. What was I
thinking, and why can't I seem to get this code right?
This commit is contained in:
Joey Hess 2013-02-23 12:32:09 -04:00
parent acc3c8c157
commit 8d9c2afd89
4 changed files with 24 additions and 20 deletions

1
debian/changelog vendored
View file

@ -13,6 +13,7 @@ git-annex (3.20130217) UNRELEASED; urgency=low
each time they are mounted.
* Direct mode: Fix support for adding a modified file.
* Avoid passing -p to rsync, to interoperate with crippled filesystems.
* Additional GIT_DIR support bugfixes. May actually work now.
-- Joey Hess <joeyh@debian.org> Sun, 17 Feb 2013 16:42:16 -0400