mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1
21605 commits 13 branches 451 tags 137 MiB
Commit graph

21605 commits

This branch
This branch
All branches
Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
26b38fdfbc 2014-10-16 14:53:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlZ-6dtxJY4cP7shhvV8E6YyuV0Rak8it4
005be6625a Added a comment: I messed up that repo 2014-10-16 13:31:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlZ-6dtxJY4cP7shhvV8E6YyuV0Rak8it4
72c67a27ce 2014-10-16 12:08:52 +00:00
Joey Hess
fe5e25eec7 initremote: Don't allow creating a special remote that has the same name as an existing git remote. 
This is not a complete fix. For one, git remote will happily go add a
remote that has the same name as an existing special remote. For another,
enableremote will enable a special remote over top of an existing git
remote. And, also, the webapp might.
 2014-10-15 15:47:49 -04:00
Joey Hess
0a142fdd83 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-15 14:37:54 -04:00
Joey Hess
ba69d52e03 Merge orca:/tmp/git-annex 2014-10-15 14:37:47 -04:00
Joey Hess
4f62c5358c android rebuild WIP 2014-10-15 14:37:21 -04:00
Joey Hess
807f8553c3 warnings 2014-10-15 14:29:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4
d518a5c69e Added a comment 2014-10-15 17:44:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4
f56a2e869e Added a comment 2014-10-15 17:34:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4
4c7d2793e3 Added a comment 2014-10-15 17:32:10 +00:00
Joey Hess
cdcb4548b3 Remove hurd stuff from cabal file, since hackage currently rejects it. 
https://github.com/haskell/hackage-server/issues/269
 2014-10-15 13:31:20 -04:00
http://joeyh.name/
ff6894d63a Added a comment 2014-10-15 17:30:45 +00:00
http://joeyh.name/
25ffed3486 Added a comment 2014-10-15 17:25:27 +00:00
Joey Hess
9c8abb761f revert reversion 
This reverts commit 7bfc4a5442.

Android build is going to have consistent versions again.
 2014-10-15 11:49:13 -04:00
http://digiuser.livejournal.com/
83fc9dd982 Added a comment: Homebrew 2014-10-15 15:37:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw
f9aaabbe29 Added a comment: Not on hackage 2014-10-15 15:34:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnjssENdbjzvblxOm4Qr8x2C-BdIV_k_y4
c7d5c5c3cb Added a comment 2014-10-15 15:25:27 +00:00
http://joeyh.name/
aef4e133e0 Added a comment 2014-10-15 15:25:14 +00:00
Joey Hess
6b08fdc818 fix build failure with empty parameter 2014-10-15 11:19:14 -04:00
Joey Hess
347d14c0d7 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-15 11:17:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnUuvup1XA5YGt8gBUnfzCrvISX-qINsmo
196244cee1 2014-10-15 12:56:11 +00:00
Joey Hess
3332c4289b no more need for .cabal/bin in PATH 2014-10-15 01:17:17 -04:00
Joey Hess
797301b285 switching android builder to debian jessie 2014-10-14 19:21:26 -04:00
Joey Hess
f8c3c1f4a6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-14 18:37:59 -04:00
Joey Hess
09946d245d close 2014-10-14 18:36:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY
6da76fb06f Added a comment 2014-10-14 22:13:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY
65f92fbfde Added a comment 2014-10-14 22:09:37 +00:00
Joey Hess
f0d1dc03d1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-14 17:41:44 -04:00
Joey Hess
352e53cc57 avoid pinning some core libs 
These vary depending on ghc version, so need to be different
in the native and android ghc cabals.
 2014-10-14 17:27:47 -04:00
Joey Hess
580b41850f avoid pinning more ghc builtins 2014-10-14 17:11:28 -04:00
Joey Hess
dadb152988 fix path 2014-10-14 17:04:39 -04:00
Joey Hess
a6d73bb8fe don't pin base 2014-10-14 17:04:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw
686ffa2416 2014-10-14 20:30:08 +00:00
Joey Hess
395371ea37 make cabal.config be available whenever cabal install is run 
Ensures the constraints are consistently applied.
 2014-10-14 16:02:02 -04:00
Joey Hess
cf005058e4 use cabal.config when installing native 2014-10-14 15:34:06 -04:00
Joey Hess
7a78d111fc use pinned package versions from cabal.config 2014-10-14 15:25:02 -04:00
Joey Hess
9fd3e657e3 actual bounds from android autobuilder 2014-10-14 15:08:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
f31bf4b439 2014-10-14 19:02:22 +00:00
Joey Hess
bd8ecd48b1 de-qualify import 
still building with old yesod on android and armel
 2014-10-14 14:45:15 -04:00
Joey Hess
7bfc4a5442 unbreak android build 
This reverts commit dd667844b6
and commit e6eff0e951.

Those commits were fine, except the android autobuilder currently has a bit
of a mess of yesod versions and broke. Better to wait on this.
 2014-10-14 14:38:38 -04:00
Joey Hess
4d681ae38b warning 2014-10-14 14:29:53 -04:00
Joey Hess
c8c65322a5 unused import 2014-10-14 14:26:29 -04:00
Joey Hess
59f88558d5 doh't use "def" for command definitions, it conflicts with Data.Default.def 2014-10-14 14:20:10 -04:00
Joey Hess
db9121ecee vicfg: Deleting configurations now resets to the default, where before it has no effect. 
Added a Default instance for TrustLevel, and was able to use that to clear
up several other parts of the code too.

This commit was sponsored by Stephan Schulz
 2014-10-14 14:15:07 -04:00
Joey Hess
5fcb75d371 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-14 12:26:50 -04:00
Joey Hess
ccc45dae92 typo 2014-10-14 12:20:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
f233fef820 2014-10-14 10:18:32 +00:00
Bram
2d8520136e Added a comment: Diff of unlocked file 2014-10-14 10:11:04 +00:00
Joey Hess
a8b2568531 package-qualified import needed by new yesod 2014-10-14 01:25:37 -04:00