Commit graph

22596 commits

Author SHA1 Message Date
http://joeyh.name/
d151596e65 Added a comment 2015-01-07 20:39:27 +00:00
Joey Hess
b43acc935e devblog 2015-01-07 16:16:04 -04:00
Joey Hess
bfa6d17e00 remove debug prints; even going to stderr that breaks gnupg's configure script 2015-01-07 16:00:31 -04:00
Joey Hess
51684dc600 typo 2015-01-07 15:50:10 -04:00
Joey Hess
51dd68a28c smarter wrapper; detect -r link option
/home/builder/.ghc/android-14/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: fatal error: -pie and -r are incompatible
2015-01-07 15:48:11 -04:00
Joey Hess
a3ec1d9c12 minor typo 2015-01-07 15:37:22 -04:00
Joey Hess
605600afdb add $@ to wrapper 2015-01-07 15:36:19 -04:00
Joey Hess
508692f110 more PATH typos 2015-01-07 15:35:08 -04:00
Joey Hess
9b5ef546b9 fix path 2015-01-07 15:33:12 -04:00
Joey Hess
c5775455e7 fix -fPIE option 2015-01-07 15:30:50 -04:00
Joey Hess
fc6506b041 subshells for cd && 2015-01-07 15:11:10 -04:00
Joey Hess
0ca73b51b6 typos 2015-01-07 15:08:52 -04:00
Joey Hess
997c4575e0 fix BIGNUM related openssh build breakage 2015-01-07 14:49:04 -04:00
Joey Hess
edf48524da typo 2015-01-07 14:22:02 -04:00
Joey Hess
7ea4cd1688 fix dir name 2015-01-07 14:20:26 -04:00
Joey Hess
f6fa2e6296 typo 2015-01-07 14:17:36 -04:00
Joey Hess
b20d8b5471 Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-07 14:15:27 -04:00
Joey Hess
06d1ccd2c7 android binary compatability is so bad we have to build all utilities twice 2015-01-07 14:14:37 -04:00
http://joeyh.name/
4efae77045 Added a comment 2015-01-07 17:25:43 +00:00
etset
567ac625ba Added a comment: git-annex is correctly linked 2015-01-07 14:30:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPIqJZ88VZEVqLhLOd1LMdYXcy6bAW9qE
c845ba4b42 Added a comment 2015-01-07 13:54:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm_YXzEdPHzbSGVwtmTR7g1BqDtTnIBB5s
d92a1f7122 Added a comment: File immutability 2015-01-07 12:06:15 +00:00
http://joeyh.name/
6f94ac268e Added a comment 2015-01-07 02:41:21 +00:00
http://joeyh.name/
ddf8b02cbb Added a comment 2015-01-07 02:37:25 +00:00
Joey Hess
6461de1335 Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-06 22:36:45 -04:00
http://joeyh.name/
730225034f Added a comment 2015-01-07 02:35:46 +00:00
Joey Hess
b84070b5e9 note about windows path length issues with larger hashes 2015-01-06 22:33:57 -04:00
Joey Hess
f9445ff95a retitle 2015-01-06 22:30:02 -04:00
Joey Hess
44c9714fdf handle sync's use of setCurrentDirectory to work with relative paths
I think this is the last problimatic setCurrentDirectory. I also audited
for extrnal commands that git-annex might run with cwd = foo, and did not
find any that were passed any FilePath that might be absolute.
2015-01-06 22:23:04 -04:00
Joey Hess
676ef32547 Merge branch 'master' into relativepaths 2015-01-06 21:41:25 -04:00
Joey Hess
adefcf189a Bugfix: A file named HEAD in the work tree could confuse some git commands run by git-annex. 2015-01-06 21:41:21 -04:00
Joey Hess
184ad45b42 Merge branch 'master' into relativepaths 2015-01-06 21:10:01 -04:00
Joey Hess
d7f1449b2b fix view generation code to work when run in a subdirectory; no longer needs to setCurrentDirectory to top of repo 2015-01-06 21:01:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
39849c5455 removed 2015-01-06 23:00:26 +00:00
Joey Hess
858d776352 Merge branch 'master' into relativepaths
Conflicts:
	Locations.hs
	debian/changelog
2015-01-06 19:00:01 -04:00
Joey Hess
9d75709bf7 build fix 2015-01-06 18:59:13 -04:00
Joey Hess
b97486bc55 Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-06 18:58:07 -04:00
Joey Hess
965e106f24 made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /

This commit was sponsored by Audric SCHILTKNECHT.
2015-01-06 18:55:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlcfH7xkyz1kyG_neK4GcFFfFWuIY7l_6A
db65b16f65 Added a comment: large scale rewrite tips 2015-01-06 22:55:20 +00:00
etset
e779d40f3c Added a comment: Still not working 2015-01-06 22:48:18 +00:00
Joey Hess
d09a198ec0 update 2015-01-06 18:02:56 -04:00
Joey Hess
add35d9593 Merge branch 'master' of ssh://git-annex.branchable.com 2015-01-06 18:00:53 -04:00
Joey Hess
518d3a5ba4 debblugh 2015-01-06 18:00:42 -04:00
Joey Hess
b33a51578f remove obsolete comment about a fixed bug to avoid confusion. 2015-01-06 18:00:17 -04:00
http://joeyh.name/
671f66509f Added a comment 2015-01-06 21:59:15 +00:00
Joey Hess
c0f2b992ed Generate shorter keys for WORM and URL, avoiding keys that are longer than used for SHA256, so as to not break on systems like Windows that have very small maximum path length limits. 2015-01-06 17:58:57 -04:00
Joey Hess
8a1c5956eb absolute path to index file; test suite passes
There are still known problems; for example git annex view a=b fails when
run in a subdir of the repo.
2015-01-06 17:34:02 -04:00
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
http://joeyh.name/
aab8b4fc58 Added a comment 2015-01-06 20:51:20 +00:00