Commit graph

34756 commits

Author SHA1 Message Date
quzhengrobot@6237b7730f478778d064c18a5a314535129357dd
dff0a44287 Added a comment: Android - gitlab repo 2019-05-08 11:35:04 +00:00
Joey Hess
8b44548d0e
comment 2019-05-07 13:20:03 -04:00
Joey Hess
aaeb85361c
Merge branch 'wip' 2019-05-07 13:07:45 -04:00
Joey Hess
0dead2d6ec
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 13:06:30 -04:00
Joey Hess
7264863a01
add news item for git-annex 7.20190507 2019-05-07 13:06:14 -04:00
Joey Hess
6eaa0af42f
releasing package git-annex version 7.20190507 2019-05-07 13:05:52 -04:00
Joey Hess
2d33122215
avoid ingest lockdown file escaping the withOtherTmp call
Fixes bug that caused git-annex to fail to add a file when another
git-annex process cleaned up the temp directory it was using.

Solution is just to push withOtherTmp out to a higher level, so that
the whole ingest process can be completed inside it.

But in the assistant, that was not practical to do, since withOtherTmp runs
in the Annex monad and the assistant does not. Worked around by introducing
a separate temp directory that only the assistant uses for lockdown.
Since only one assistant can run at a time, it's easy to clean up that
directory of old cruft at startup.
2019-05-07 13:04:57 -04:00
Ilya_Shlyakhter
cc7c20f428 Added a comment 2019-05-07 16:53:10 +00:00
Joey Hess
f98e97669e
comment 2019-05-07 12:10:03 -04:00
Joey Hess
eb592a1f20
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:08:30 -04:00
Joey Hess
d6198442ce
comment 2019-05-07 12:08:07 -04:00
Ilya_Shlyakhter
6d5ba46776 Added a comment 2019-05-07 16:04:58 +00:00
Joey Hess
7da721e356
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:04:19 -04:00
Joey Hess
2a41712ef1
avoid stageJournal escaping withOtherTmp
This is only done for correctness sake; I don't see any way that it
would have caused a problem here. The jlog file escaped withOtherTmp
so another process could swoop in and delete it, but the file is only
used as a buffer for a list of filenames, and its handle gets rewound
and they're read back out, which will still work even if it's already
been deleted.

The only reason I didn't just pre-delete the file and keep the handle
open is I'm not sure that works on all OS's (eg Windows). If there was
a problem that this fixed it might involve an OS that doesn't support
deleting an open file or something like that.
2019-05-07 11:57:12 -04:00
Ilya_Shlyakhter
d46b916f3b Added a comment 2019-05-07 15:50:52 +00:00
Joey Hess
ce83783fcc
bug report 2019-05-07 11:40:45 -04:00
Joey Hess
09c2516487
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 11:21:30 -04:00
Joey Hess
5c217449cc
comment 2019-05-07 11:21:18 -04:00
Joey Hess
37ce10098c
comment 2019-05-07 11:12:00 -04:00
Ilya_Shlyakhter
5638ae9688 Added a comment 2019-05-07 00:59:31 +00:00
Ilya_Shlyakhter
4d0ae18635 Added a comment 2019-05-06 22:38:43 +00:00
Joey Hess
ecdbdf6180
add --verify
Needed for the --quiet to actually shut it up. The extra verification
this makes it do should be fine, as this is supposed to really return a
single tree's sha.
2019-05-06 16:41:01 -04:00
Joey Hess
e29f07258a
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 16:30:47 -04:00
Joey Hess
d08c19defb
avoid git warning on first import of subdir from a remote
git rev-parse --quiet avoids "fatal: Invalid object name" when the
branch does not exist. Git.Ref.tree already returned a Maybe, so callers
already handle those cases themselves.
2019-05-06 16:29:34 -04:00
Ilya_Shlyakhter
54b0028b5b Added a comment 2019-05-06 20:24:14 +00:00
Joey Hess
b03e65d260
Improved locking when multiple git-annex processes are writing to the .git/index file 2019-05-06 15:15:12 -04:00
Joey Hess
4bc99e4c21
add todo 2019-05-06 14:58:59 -04:00
Joey Hess
65a82e0d27
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 14:45:02 -04:00
Joey Hess
c31d0fe11b
re worktrees 2019-05-06 14:42:51 -04:00
Ilya_Shlyakhter
f0f0d6e61c Added a comment 2019-05-06 18:39:07 +00:00
Joey Hess
c5e0f9b3a5
fix setting imported tree
bf7ecd6892 went too far and broke
importing, the old tree was used on the remote tracking branch and not
the newly imported tree.

Test suite noticed the problem luckily.
2019-05-06 14:38:02 -04:00
Joey Hess
6c7bbe2c5a
test case for bf7ecd6892 2019-05-06 14:24:42 -04:00
Joey Hess
4f11885c12
response 2019-05-06 14:01:56 -04:00
Joey Hess
4999e6dd25
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 13:57:39 -04:00
Joey Hess
bf7ecd6892
fix export subtree reversion
Fix reversion in last release that caused wrong tree to be written to
remote tracking branch after an export of a subtree.

The invariant "commitsha should have the treesha as its tree"
was not met due to a bug. Guarantee it's met by catting the commitsha
to find its actual tree. A little bit slower, but this is not run often.
2019-05-06 13:57:13 -04:00
Ilya_Shlyakhter
590acf2b0d question about concurrent writing to the git-annex branch by multiple git-annex commands 2019-05-06 17:05:50 +00:00
Joey Hess
0533fde73c
reproduced 2019-05-06 12:43:26 -04:00
Joey Hess
1bae209470
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 12:42:49 -04:00
Joey Hess
c6a4779036
analysis 2019-05-06 12:39:35 -04:00
Joey Hess
6ad51d5627
comment 2019-05-06 12:29:53 -04:00
Joey Hess
7c874327aa
comment 2019-05-06 12:25:17 -04:00
Joey Hess
6845c1e020
comment 2019-05-06 12:16:19 -04:00
Joey Hess
7c6ada691b
comment 2019-05-06 12:07:08 -04:00
Joey Hess
b3eed0feac
comment 2019-05-06 12:04:25 -04:00
Joey Hess
1a0c3e864b
close 2019-05-06 12:02:10 -04:00
Joey Hess
bcbaf3a851
update 2019-05-06 10:51:54 -04:00
herbgroll@5a05f17cf9cd3d69057fee2991f630e5a60cd197
947503cc6d 2019-05-05 19:15:28 +00:00
Joey Hess
afd57e137b
tweak to fix man page indent 2019-05-04 11:45:55 -04:00
Joey Hess
fd57780d04
add news item for git-annex 7.20190503 2019-05-03 12:49:01 -04:00
Joey Hess
4da50456a3
releasing package git-annex version 7.20190503 2019-05-03 12:48:28 -04:00