Commit graph

22394 commits

Author SHA1 Message Date
Joey Hess
d44b28437d git-hash-object needs absolute files (git bug)
A relative path to a file makes it fail. I am pretty sure this is a git
bug; workaround it.
2015-01-06 17:33:29 -04:00
Joey Hess
d8a2f658dd direct mode merge relative path trickiness
This fixes 9 test suite failures. There are some tricky things going on
with the paths to the index file, and git's working directory, which
are hard to get right with relative paths. So, I switched back to absolute
here, at least for now.

Only 2 test suite failures remain on this branch, but there are other
potential problems the test suite doesn't catch. Including some calls to
setCurrentDirectory -- I was wrong and git-annex does do that in a few
places, like when generating a view.
2015-01-06 17:18:12 -04:00
Joey Hess
82f667e7f2 git repo path may be relative, so don't assume absolute any more
Fixes 6 test failures.
2015-01-06 16:32:44 -04:00
Joey Hess
cd865c3b8f Switch to using relative paths to the git repository.
This allows the git repository to be moved while git-annex is running in
it, with fewer problems.

On Windows, this avoids some of the problems with the absurdly small
MAX_PATH of 260 bytes. In particular, git-annex repositories should
work in deeper/longer directory structures than before. See
http://git-annex.branchable.com/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/

There are several possible ways this change could break git-annex:

1. If it changes its working directory while it's running, that would
   be Bad News. Good news everyone! git-annex never does so. It would also
   break thread safety, so all such things were stomped out long ago.

2. parentDir "." -> "" which is not a valid path. I had to fix one
   instace of this, and I should probably wipe all calls to parentDir out
   of the git-annex code base; it was never a good idea.

3. Things like relPathDirToFile require absolute input paths,
   and code assumes that the git repo path is absolute and passes it to it
   as-is. In the case of relPathDirToFile, I converted it to not make
   this assumption.

Currently, the test suite has 16 failures.
2015-01-06 16:19:41 -04:00
Joey Hess
550f269828 now I know why the test suite failed on the autobuilder.. MAX_PATH 2015-01-06 14:52:43 -04:00
Joey Hess
c15fc92c16 try to avoid Windows MAX_PATH limit, by using \\?\ prefix on git repo path 2015-01-06 14:50:15 -04:00
Joey Hess
ae14354686 this comment seems to be A) useless or B) very stealth spam 2015-01-06 13:59:49 -04:00
Joey Hess
0724cd8caa comment 2015-01-06 13:59:13 -04:00
Joey Hess
b6acb2e22b pass pie options to C compiler, not just to linker 2015-01-06 13:16:32 -04:00
etset
343a07b303 Added a comment: Same for me 2015-01-06 12:45:25 +00:00
http://inkwell.za.net/
2b19ae9e38 Added a comment: Logfile with errors 2015-01-06 11:43:13 +00:00
gio
07b5aa4a6b Added a comment 2015-01-06 10:07:50 +00:00
gio
9037b783d4 2015-01-06 09:57:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm_YXzEdPHzbSGVwtmTR7g1BqDtTnIBB5s
9b99fbb50e Added a comment: Over-long pathnames? 2015-01-06 09:41:03 +00:00
battykt
f26f7b117d Added a comment: Re:How To Permanently Delete a File 2015-01-06 07:48:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
93fab9b571 Added a comment 2015-01-06 01:52:03 +00:00
Joey Hess
8759b9e7af Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-05 18:58:56 -04:00
Joey Hess
ad6c58fe92 comment 2015-01-05 18:56:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne3YCXovu_ERUYNpH46AVo0FlgyQwt3HI
832d18e539 Added a comment 2015-01-05 21:19:37 +00:00
Joey Hess
f4202a6b0f devblog 2015-01-05 17:12:45 -04:00
Joey Hess
db280bbd8a comment 2015-01-05 17:11:08 -04:00
Joey Hess
ccffed1c8b Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-05 17:09:27 -04:00
Joey Hess
3009d9d535 comment 2015-01-05 17:03:44 -04:00
Joey Hess
d9db407716 comment 2015-01-05 16:58:19 -04:00
Joey Hess
d27c1b4688 close 2015-01-05 16:51:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne3YCXovu_ERUYNpH46AVo0FlgyQwt3HI
9dc9935aa5 Added a comment 2015-01-05 20:47:31 +00:00
Joey Hess
bc633954e4 remove obsolete note; s3-aws was merged already 2015-01-05 16:45:22 -04:00
Joey Hess
014bd67f4a comment 2015-01-05 16:41:06 -04:00
Joey Hess
d0a4c99daa comment 2015-01-05 16:37:08 -04:00
Joey Hess
268aa8fd9b comment 2015-01-05 16:32:15 -04:00
Joey Hess
56eb0bc73a comment 2015-01-05 16:27:03 -04:00
Joey Hess
cef498c2c2 comment 2015-01-05 16:22:32 -04:00
Joey Hess
dfca751998 split docs and script 2015-01-05 16:12:07 -04:00
Joey Hess
cc7e7a1e75 comment 2015-01-05 16:09:52 -04:00
Joey Hess
4d786ebe4a Check git version at runtime, rather than assuming it will be the same as the git version used at build time when running git-checkattr and git-branch remove.
It's ok to probe every time for git-branch remove because that's
run quite rarely. For git-checkattr, it's run only once, when
starting the --batch mode, and so again the overhead is pretty minimal.

This leaves 2 places where the build version is still used.
git merge might be interactive or fail if one skews, and --no-gpg-sign
might not be pased, or might be passed to a git that doesn't understand it
if the other skews. It seems a little expensive to check the git version
each time these are used.

This doesn't seem likely to cause many problems, at least compared with
check-attr hanging on skew.
2015-01-05 15:54:52 -04:00
Joey Hess
bbd5812ab0 iupdate licenses file, removing ASPL
The git-annex dmg used to include some OSX system libraries, but it doesn't
anymore.
2015-01-05 15:47:02 -04:00
Joey Hess
584eac78e6 sync: Fix an edge case where syncing in a bare repository would try to merge and so fail.
In the case where a remote of the bare repo has a fetch =  configuration,
refs/remotes/origin/master will exist, and so the merge code path tried to
run in the bare repo.
2015-01-05 13:40:49 -04:00
Joey Hess
18f74b52bd followup 2015-01-05 13:08:32 -04:00
Joey Hess
342f97159c fix cd issue 2015-01-05 12:57:54 -04:00
Joey Hess
89ccca5075 comment 2015-01-05 12:49:30 -04:00
Joey Hess
1bc631afd9 answer 2015-01-05 12:46:23 -04:00
Joey Hess
fdb5c855cd Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-05 12:29:40 -04:00
Joey Hess
5c77cef271 Android: Provide a version built with -fPIE -pie to support Android 5.0. 2015-01-05 12:29:20 -04:00
Joey Hess
96a9cd8305 comment 2015-01-05 11:58:51 -04:00
Joey Hess
bec2e85698 fix name 2015-01-05 11:52:51 -04:00
rejuvyesh
fc3f656651 newline 2015-01-04 19:28:41 +00:00
rejuvyesh
1d7c7acb0a Add another link for AI papers 2015-01-04 19:27:42 +00:00
Joey Hess
5db31e2386 Fix build with process 1.2.1.0. 2015-01-04 13:07:57 -04:00
Joey Hess
f2262991e9 Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-04 12:33:57 -04:00
Joey Hess
73928c2274 Avoid re-checksumming when migrating from hash to hashE backend. Closes: #774494 2015-01-04 12:33:10 -04:00