Commit graph

27679 commits

Author SHA1 Message Date
thk
ffeef75917 2020-04-19 08:15:47 +00:00
yarikoptic
6c9c974e55 Added a comment 2020-04-18 02:14:32 +00:00
yarikoptic
67f0407477 Added a comment 2020-04-18 02:05:52 +00:00
Joey Hess
b480ce01f7
Merge branch 'master' of ssh://git-annex.branchable.com 2020-04-17 17:47:59 -04:00
Joey Hess
2da760fcae
comment 2020-04-17 17:32:49 -04:00
yarikoptic
a2b2708ab6 Added a comment: quick follow up 2020-04-17 20:34:55 +00:00
Joey Hess
988317634b
comment 2020-04-17 14:11:17 -04:00
Joey Hess
6c39ec9b27
comment 2020-04-17 12:37:28 -04:00
Dan
b325dfea4d Added a comment: find wanted on remote? 2020-04-16 21:19:44 +00:00
yarikoptic
5dc513ccdb Added a comment 2020-04-16 03:43:13 +00:00
yarikoptic
1705d3657e Added a comment: it is many more "open files" in reality 2020-04-16 03:41:07 +00:00
Joey Hess
957a87b437
fix absolute filenames fed into --batch and git-annex info 2020-04-15 16:04:05 -04:00
Joey Hess
a14168a321
reproduced 2020-04-15 15:06:53 -04:00
Joey Hess
503abb6d54
remove warning about git gc for annex.alwayscommit=false
I doubt that warning has ever been right, but I'm sure it is not right
now.

For there to be a risk of git gc deleting objects that are in the annex
index, journal files would have to be staged into it, and deleted, but
the index not committed to the git-annex branch. And AFAICS, there is no
code path where that actually happens. I considered adding one recently,
but didn't.

The way it actually works is, as long as the user has annex.alwayscommit=false
the data lives in the journal, where it's safe from git gc. Then when
git-annex is run w/o that config, the journal is staged into the index,
which is immediately committed to the branch. There's no window where
git gc could delete the objects, because git gc only deletes objects
after some time (2 weeks by default).

Now, if git-annex gets suspended at just the wrong time, or interrupted,
then yes, it's possible. But doesn't matter whether that config was ever
set or not. And many uses of git-annex also recover from that situation
by committing to the git-annex branch.
2020-04-15 14:25:33 -04:00
Joey Hess
ddadc0c1aa
Merge branch 'master' of ssh://git-annex.branchable.com 2020-04-15 14:20:06 -04:00
Joey Hess
891e9a81eb
close bug that was apparently fixed satisfactorally 2020-04-15 14:17:21 -04:00
Joey Hess
a2fed82267
close 2020-04-15 14:15:41 -04:00
Joey Hess
7ef030b576
close old bug since git-annex no longer uses rsync like it used to 2020-04-15 14:08:48 -04:00
kyle
1a040e0c0a Added a comment 2020-04-15 18:02:29 +00:00
Joey Hess
43a9808292
disable journal read optimisation when alwayscommit=false
The journal read optimisation in aeca7c220 later got fixed in eedd73b84
to stage and commit any files that were left in the journal by a
previous git-annex run. That's necessary for the optimisation to work
correctly. But it also meant that alwayscommit=false started committing
the previous git-annex processes journalled changes, which defeated the
purpose of the config setting entirely.

So, disable the optimisation when alwayscommit=false, leaving the
files in the journal and not committing them. See my comments on the bug
report for why this seemed the best approach.

Also fixes a problem when annex.merge-annex-branches=false and there
are changes in the journal. That config indirectly prevents committing
the journal. (Which seems a bit odd given its name, but it always has..)
So, when there were changes in the journal, perhaps left there due to
alwayscommit=false being set before, the optimisation would prevent
git-annex from reading the journal files, and it would operate with out
of date information.
2020-04-15 13:24:33 -04:00
Joey Hess
9f17242f29
comment 2020-04-15 12:48:55 -04:00
Joey Hess
8ac44498d6
comment 2020-04-15 12:43:22 -04:00
Joey Hess
1aa7082c9a
better response 2020-04-15 12:17:57 -04:00
Joey Hess
b241f579c0
hm 2020-04-15 12:14:39 -04:00
Joey Hess
f4d5ec1457
correction 2020-04-15 12:12:11 -04:00
Joey Hess
520ddf1c75
comment 2020-04-15 12:10:51 -04:00
Christoph.Schmidpeter@d3e5d124c7d5459315c2a9f983ab9a70b88e1d03
95b505c22f 2020-04-15 13:06:14 +00:00
Christoph.Schmidpeter@d3e5d124c7d5459315c2a9f983ab9a70b88e1d03
98c1047a29 removed 2020-04-15 13:00:12 +00:00
Christoph.Schmidpeter@d3e5d124c7d5459315c2a9f983ab9a70b88e1d03
c510e83001 Added a comment: Problems with Assistant and Android 2020-04-15 12:59:44 +00:00
Christoph.Schmidpeter@d3e5d124c7d5459315c2a9f983ab9a70b88e1d03
98fac2be0e 2020-04-15 12:59:04 +00:00
Christoph.Schmidpeter@d3e5d124c7d5459315c2a9f983ab9a70b88e1d03
61ba4d6387 2020-04-15 12:09:08 +00:00
kyle
b11931a4aa bug: alwayscommit=false creating commits 2020-04-14 22:43:34 +00:00
erewhon
92c1d0863b Added a comment 2020-04-14 21:45:35 +00:00
erewhon
5d1495ee0f removed 2020-04-14 21:30:38 +00:00
erewhon
40a3545149 Added a comment 2020-04-14 21:20:51 +00:00
erewhon
a9f7770cde removed 2020-04-14 21:19:46 +00:00
erewhon
6add91fefd Added a comment 2020-04-14 21:18:23 +00:00
Joey Hess
ba6f46c113
--auto doc wording
try to make more clear that --auto is not --all
2020-04-13 16:12:48 -04:00
kyle
b60f29f17b Added a comment 2020-04-13 18:58:50 +00:00
Joey Hess
c22c07bbed
Merge branch 'master' of ssh://git-annex.branchable.com 2020-04-13 14:32:46 -04:00
Joey Hess
e57aebf6ad
comment 2020-04-13 14:07:23 -04:00
Joey Hess
fbd78cff64
improve documentation 2020-04-13 12:33:35 -04:00
bjornw@6a7d7d0413efc7ed3bb44922586f040bb768b71c
e96d3b5776 2020-04-13 16:30:33 +00:00
4omecha@fff0ca6fa5307d92706e5ee6812d8db8f8067df0
25ac0ef160 Best way to restore objects with correct names w/o git log present? 2020-04-13 09:19:23 +00:00
4omecha@fff0ca6fa5307d92706e5ee6812d8db8f8067df0
16f2ccfc7c bad edit
This reverts commit ce664ebc7b
2020-04-13 09:16:39 +00:00
4omecha@fff0ca6fa5307d92706e5ee6812d8db8f8067df0
ce664ebc7b Best way to restore objects with correct names w/o git log present? 2020-04-13 09:13:51 +00:00
Ilya_Shlyakhter
995d327784 Added a comment 2020-04-13 00:53:59 +00:00
erewhon
4714d2cc5e 2020-04-12 19:28:38 +00:00
erewhon
f6e0345b07 2020-04-12 19:10:35 +00:00
Joey Hess
df587ff068
Merge branch 'master' of ssh://git-annex.branchable.com 2020-04-10 14:46:59 -04:00