Commit graph

20234 commits

Author SHA1 Message Date
http://id.clacke.se/
d0ee302e64 Added a comment 2016-04-22 19:01:46 +00:00
Joey Hess
0bba2627df
response; improve docs 2016-04-22 14:49:15 -04:00
Joey Hess
7945dd3c3e
refactor 2016-04-22 14:35:48 -04:00
Joey Hess
46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
Joey Hess
8ab27235ea
reinject: Added new mode which can reinject known files into the annex.
For example: git-annex reinject --known /mnt/backup/*
2016-04-22 13:49:32 -04:00
zarel
d98f6d20d9 Added a comment 2016-04-22 15:27:20 +00:00
zarel
a718cf2344 rename bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn to bugs/startup_scan_extremely_slow.mdwn 2016-04-22 15:22:03 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
bc3614eba0 Added a comment 2016-04-22 12:38:16 +00:00
http://id.clacke.se/
f0d0e785e6 Added a comment: objecthashlower 2016-04-22 07:58:33 +00:00
http://id.clacke.se/
bf5ac8227b Added a comment: objecthashlower 2016-04-22 07:55:40 +00:00
http://id.clacke.se/
8c3a95b02c Added a comment: Case-sensitive on OSX 2016-04-22 07:53:56 +00:00
http://id.clacke.se/
164fb10308 Added a comment: git-annex is git 2016-04-22 07:44:07 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
8e27f35608 2016-04-22 03:14:03 +00:00
Joey Hess
dab3b9c1b1
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-21 14:24:38 -04:00
Joey Hess
b4cb1093bb
todo 2016-04-21 14:24:06 -04:00
pigmonkey
080c3c9cc9 Added a comment 2016-04-21 16:57:03 +00:00
Joey Hess
eb4b556113
calckey can use --backend 2016-04-21 11:23:17 -04:00
cstork
c6c83ccb85 Added a comment 2016-04-21 14:35:46 +00:00
CandyAngel
53c7c246a6 Added a comment 2016-04-21 11:41:09 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
0cf680bdaa Added a comment 2016-04-21 09:00:49 +00:00
cstork
fd5408e1cb Added a comment 2016-04-21 06:46:40 +00:00
Joey Hess
940f1b5cf0
devblog 2016-04-20 16:15:46 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00:00
Joey Hess
fcd09badca
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 15:05:02 -04:00
Joey Hess
c3fdaf764d
Isolate test suite from global git config settings. 2016-04-20 15:04:38 -04:00
spwhitton
2c969a94fb Added a comment 2016-04-20 19:01:21 +00:00
Joey Hess
b56218f0c2
Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave. 2016-04-20 14:43:43 -04:00
Joey Hess
da4ff16805
comment 2016-04-20 14:36:46 -04:00
Joey Hess
b143f630c2
comment 2016-04-20 14:27:24 -04:00
Joey Hess
7dfce1f41e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 14:25:09 -04:00
Joey Hess
70016c8dc2
comment 2016-04-20 14:24:26 -04:00
pigmonkey
b245e7b7a1 Added a comment 2016-04-20 18:20:43 +00:00
Joey Hess
5664fce5dd
comment 2016-04-20 14:13:52 -04:00
Joey Hess
052b440e7c
this bug report/rant section has gotten way past diminishing returns, so I am deleting it
Sorry, but I have no interest in arguing about false equivilances such as
comment 23.
2016-04-20 14:00:39 -04:00
Joey Hess
a6dfea161f
paren 2016-04-20 13:55:15 -04:00
Joey Hess
0d41657f5c
fixed via time machine 2016-04-20 13:52:49 -04:00
Joey Hess
1bfea9b3e5
calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
Joey Hess
9d952fe9d1
reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Joey Hess
bb92b45fb7
comment 2016-04-20 12:57:22 -04:00
Joey Hess
4c7e835d39
response 2016-04-20 12:55:03 -04:00
Joey Hess
2ee46024c0
followup 2016-04-20 12:51:31 -04:00
Joey Hess
744c236b78
comment 2016-04-20 12:45:58 -04:00
Joey Hess
aa68f2ea7e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 12:40:33 -04:00
Joey Hess
f947781fa0
Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files. 2016-04-20 12:40:11 -04:00
pigmonkey
533370576e 2016-04-20 16:32:36 +00:00
Joey Hess
b949e85045
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015.

Command line used:

for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
2016-04-19 13:55:29 -04:00
Joey Hess
a9c7260adb
reopen, comment 2016-04-19 13:27:56 -04:00
Joey Hess
850d0da699
Fix duplicate progress meter display when downloading from a git remote over http with -J. 2016-04-19 13:10:56 -04:00
Joey Hess
e3fb94b006
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-19 12:51:36 -04:00
Joey Hess
60ae80a13a
reproduced 2016-04-19 12:51:20 -04:00