mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22476 commits 13 branches 442 tags 103 MiB
Commit graph

22476 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ewen
f3443d0e0e Added a comment: itempubdate 2015-01-03 22:01:37 +00:00
http://svario.it/gioele
cb01ec2782 New page "List annexed files in chronological order?" 2015-01-03 08:20:46 +00:00
2001:41d0:fe61:2600:8110:7b59:c518:a87f
8647f101e1 poll vote (My phone (or MP3 player)) 2015-01-03 06:42:40 +00:00
176.188.103.159
3a385f3705 poll vote (Google Drive) 2015-01-02 22:32:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm0ZGPYdW9X-QpH6ACBTrKCCAd8qyRX35g
77661e8cf0 2015-01-02 21:51:09 +00:00
Joey Hess
e26e26fb32 regression test for fd55563b02 2015-01-02 13:59:25 -04:00
Joey Hess
fd55563b02 unlock: Don't allow unlocking files that have never been committed to git before 
Avoids an intractable problem that prevents the pre-commit hook from
telling if such a file is intended to be an annexed file or not.
 2015-01-02 13:49:02 -04:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
7294439e1f Added a comment 2015-01-01 19:05:20 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
d62eaba1b0 2015-01-01 18:46:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm_r8eXWWVKgrz6PO8yiYhWQxMOYyEHYhE
f15fb258d6 2015-01-01 18:30:54 +00:00
Philipp
d158be5fda 2015-01-01 09:47:00 +00:00
Joey Hess
ef65f59a92 add news item for git-annex 5.20141231 2014-12-31 15:36:48 -04:00
Joey Hess
c678620963 touchups 2014-12-31 15:27:20 -04:00
Joey Hess
e0dbf380f1 prep release 2014-12-31 15:16:01 -04:00
Joey Hess
e013183280 OSX: Switched away from deprecated statfs64 interface. 
Getting rid of build warning

warning: 'statfs64' is deprecated: first deprecated in OS X 10.6
[-Wdeprecated-declarations]

10.6 is much older than the oldest git-annex OSX port, so won't break
anything.
 2014-12-31 12:20:27 -04:00
Joey Hess
ea8297b32c remove obsolete caveat 2014-12-31 00:33:10 -04:00
Joey Hess
f38dd8d570 update 2014-12-30 17:53:54 -04:00
Joey Hess
afd2e86ae9 devblog 2014-12-30 17:52:30 -04:00