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

68 commits

Author SHA1 Message Date
Joey Hess
e189c09195 Merge branch 'ghc7.0' 
Conflicts:
	Annex.hs
	Git/CheckAttr.hs
	Remote/S3.hs
	debian/control
	git-annex.cabal
 2012-02-15 13:52:14 -04:00
Joey Hess
d54d9ccb47 When checking that an url has a key, verify that the Content-Length, if available, matches the size of the key. 
If there's no Content-Length, or the key has no size, this check is not
done, but it should happen most of the time, and protect against web
content that has changed.
 2012-02-10 19:17:41 -04:00
Joey Hess
1211d19dbf Merge commit '3.20120123' into debian-stable 
Conflicts:
	Annex.hs
	Remote/S3.hs
	git-annex.cabal
 2012-02-08 12:40:13 -04:00
Joey Hess
ce5637498f remove Utility.Conditional and use IfElse 
This drops the >>! and >>? with the nice low fixity. IfElse does have
undocumented >>=>>! and >>=>>? operators, but I deem that too fishy.
Anyway, using whenM and unlessM is easier; I sometimes mixed the operators
up.
 2012-01-24 16:22:07 -04:00
Joey Hess
20d0288802 releasing version 3.20120123 2012-01-23 15:09:50 -04:00
Joey Hess
6d380667cb releasing version 3.20120116~bpo60+1 2012-01-23 12:16:01 -04:00
Joey Hess
85b69d541e Merge branch 'no-s3' into debian-stable 
Conflicts:
	git-annex.cabal
 2012-01-23 11:57:53 -04:00
Joey Hess
a5ec450dc9 Merge commit '3.20120116' into debian-stable 
Conflicts:
	debian/changelog
	debian/control
	git-annex.cabal
 2012-01-23 11:56:55 -04:00
Joey Hess
12c89db017 Merge branch 'master' into no-s3 
Conflicts:
	Remote.hs
	git-annex.cabal
 2012-01-16 17:01:34 -04:00
Joey Hess
2837e8fef1 releasing version 3.20120116 2012-01-16 16:52:26 -04:00
Joey Hess
da6810674c copyright 2012-01-15 14:57:52 -04:00
Joey Hess
ce608303a3 releasing version 3.20120115 2012-01-15 14:02:32 -04:00
Joey Hess
37b5b1bf0d Fix QuickCheck dependency in cabal file. 2012-01-15 13:53:51 -04:00
Joey Hess
81856c3175 add a configure check for StatFS 
This way, the build log will indicate whether StatFS can be relied on.
I've tested all the failing architectures now, and on all of them,
the StatFS code now returns Nothing, rather than Just nonsense.

Also, if annex.diskreserve is set on a platform where StatFS is not
working, git-annex will complain.

Also, the Makefile was missing the sources target used when building with
cabal.
 2012-01-15 13:49:32 -04:00
Joey Hess
b88ecbdc1b Add libghc-testpack-dev to build depends on all arches. 2012-01-13 15:50:56 -04:00
Joey Hess
3da28cad07 releasing version 3.20120106 2012-01-07 13:50:35 -04:00
Joey Hess
15cac8227a remove S3 support 
this branch removes S3 support, useful mostly for old OSs lacking hS3
 2012-01-05 23:18:09 -04:00
Joey Hess
338d472ca2 releasing version 3.20120105 2012-01-05 13:51:13 -04:00
Joey Hess
7e6a54f984 Added quickcheck to build dependencies, and fail if test suite cannot be built. 2012-01-03 14:52:20 -04:00
Joey Hess
8537b270e1 add news item for git-annex backport 2011-12-31 15:08:03 -04:00
Joey Hess
9b12701b9e releasing version 3.20111231 2011-12-31 15:07:45 -04:00
Joey Hess
389687b4c4 Merge branch 'master' into debian-stable 
Conflicts:
	Annex/Exception.hs
	debian/control
	doc/install.mdwn
	git-annex.cabal

Removed monad-control 0.3 code, not enabled in backport
 2011-12-30 23:13:44 -04:00
Joey Hess
6d4382a89e Merge branch 'new-monad-control' 2011-12-24 23:02:42 -04:00
Joey Hess
5ee4e813f0 Merge branch 'master' into debian-stable 
Conflicts:
	Git.hs
	git-annex.cabal
 2011-12-13 15:27:28 -04:00
Joey Hess
13fff71f20 split out three modules from Git 
Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
 2011-12-13 15:06:49 -04:00
Joey Hess
acb2d5a5a6 releasing version 3.20111211 2011-12-11 21:55:51 -04:00
Joey Hess
c5267802f3 version dependency on old monad-control 
This should let cabal build it with the right version.
 2011-12-10 12:56:02 -04:00
Joey Hess
730041688d add modules needed for using the new monad-control 2011-12-06 13:15:57 -04:00
Joey Hess
b8cd17b72e Merge commit '3.20111122' into debian-stable 
Conflicts:
	Git.hs
	git-annex.cabal
 2011-12-03 21:30:59 -04:00
Joey Hess
ff5df842ea releasing version 3.20111203 2011-12-03 21:13:21 -04:00
Mark Wright
041d324125 Remove haskell98 to build with ghc 7.2.2, also built with ghc 7.0.4 
Signed-off-by: Joey Hess <joey@kitenet.net>
 2011-11-26 12:05:08 -04:00
Joey Hess
322d9b1cc0 releasing version 3.20111122 2011-11-22 14:40:11 -04:00
Joey Hess
baa07971ff releasing version 3.20111111 2011-11-11 16:29:19 -04:00
Joey Hess
637b5feb45 lint 2011-11-11 01:52:58 -04:00
Joey Hess
f8911cc69d releasing version 3.20111107 2011-11-07 13:06:58 -04:00
Joey Hess
0556dc812e releasing version 3.20111105 2011-11-05 15:55:19 -04:00
Joey Hess
270c1af087 releasing version 3.20111025 2011-10-25 13:46:01 -07:00
Joey Hess
1a29b5b52e reorganize log modules 
no code changes
 2011-10-15 16:21:08 -04:00
Joey Hess
82d127de99 add git version check to configure 
Rather ugly dotted version comparison method, but it does work.
 2011-10-12 00:28:33 -04:00
Joey Hess
8ef2095fa0 factor out common imports 
no code changes
 2011-10-03 23:29:48 -04:00
Joey Hess
7dddb803a0 releasing version 3.20110928 2011-09-28 19:17:12 -04:00
Joey Hess
10a9b8f1cc releasing version 3.20110906~bpo60+1 2011-09-17 17:07:49 -04:00
Joey Hess
3e96e69ce6 Merge commit '3.20110906' into debian-stable 
Conflicts:
	Command/Add.hs
	debian/control
	doc/install/Fedora.mdwn
	doc/install/OSX.mdwn
	git-annex.cabal
 2011-09-17 09:28:55 -04:00
Joey Hess
3e73de4054 releasing version 3.20110915 2011-09-17 09:21:09 -04:00
Joey Hess
6fd0df7c2f releasing version 3.20110906 2011-09-06 15:54:21 -04:00
Joey Hess
7722147e16 add josn build dep 2011-09-06 14:36:51 -04:00
Joey Hess
d238bbd9d9 releasing version 3.20110902 2011-09-02 21:32:05 -04:00
Joey Hess
3786f8d348 releasing version 3.20110819 2011-08-19 20:38:36 -04:00
Joey Hess
f0c2130700 releasing version 3.20110817 2011-08-17 01:34:15 -04:00
Joey Hess
a80913eb54 Revert "add: Be even more robust to avoid ever leaving the file seemingly deleted." 
This reverts commit 40c6ba99f5.

Conflicts:

	Command/Add.hs
 2011-08-17 01:06:00 -04:00