Commit graph

36739 commits

Author SHA1 Message Date
vinicius.vin@6d4d58c59c394cd744d469c9d7c41e264331dfcd
4cf46f56e2 2020-03-27 20:23:15 +00:00
vinicius.vin@6d4d58c59c394cd744d469c9d7c41e264331dfcd
0784136c3c 2020-03-27 20:19:10 +00:00
j@833cff95824930f20b36c340f1217182b6937407
d2621209a9 2020-03-27 12:30:44 +00:00
kyle
dfee97cd56 Added a comment 2020-03-26 23:32:56 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
d27a94eec0 Added a comment 2020-03-26 20:36:28 +00:00
Joey Hess
c9ac7aa338
patch applied 2020-03-26 15:18:47 -04:00
Kyle Meyer
376e69ec65
adjust: Propagate submodule changes back to original branch
When the recorded submodule commit changes on an adjusted branch, the
change is carried in the function that reverseAdjustedCommit passes
for adjustTree's adjusttreeitem parameter.  Update the CommitObject
handling in adjustTree to consider adjusttreeitem so that a submodule
change is synced back.
2020-03-26 15:16:08 -04:00
Joey Hess
78977ce417
correct inaccurate part of comment 2020-03-26 15:08:12 -04:00
Joey Hess
42d73a3e62
comment 2020-03-26 14:48:54 -04:00
Joey Hess
173465592f
changelog for Kyle's other fix, and close bug 2020-03-26 13:18:41 -04:00
Kyle Meyer
39131b55ca
add --force-small: Send all non-regular files through addFile
Running `git annex add --force-small` on a modified submodule fails
when the submodule path is fed to hash-object.  This failure is
unlikely to be triggered by a caller passing a submodule explicitly to
`git annex add` because there's nothing useful that annex-add can do
with a submodule.  A more likely scenario for hitting this failure is
that the caller passes "." or a subdirectory to `annex-add` while a
submodule underneath the specified path happens to be modified.

addSmallOverridden already routes symbolic links through addFile
rather than using the custom hash-object/update-index call.  The
latter is valid only for regular files, so extend this condition so
that everything that isn't a regular file goes through addFile.  Doing
so avoids the above error because submodules come in as directories.
2020-03-26 13:14:16 -04:00
Joey Hess
c0ceb969e6
changelog for Kyle's fix 2020-03-26 13:12:49 -04:00
Kyle Meyer
339aebc6ad
add --force-small: Don't dereference link when checking file status
addSmallOverridden calls getFileStatus and then checks the result with
isSymbolicLink.  getFileStatus dereferences symbolic links, so
isSymbolicLink will always return false (assuming the getFileStatus
call doesn't fail on a broken link).  Use getSymbolicLinkStatus
instead.
2020-03-26 13:11:27 -04:00
Joey Hess
b426ff6825
minimize lenth of path to gpg agent socket
Considered using the system tmp dir rather than putting it inside .t/,
but then if TEMP were set to a long path, that would be a problem.
Relative path seems the best approach, and will always be nice and
short.

The only downside of it is, if git-annex somehow changes the cwd
while running, it would break. But git-annex does not do that, and
should never do that.
2020-03-26 13:04:24 -04:00
Joey Hess
40c911e427
analysis 2020-03-26 12:41:38 -04:00
cbaines
9292d6036c Added a comment 2020-03-25 22:40:12 +00:00
Joey Hess
c9dd1de13d
devblog 2020-03-25 13:26:25 -04:00
Joey Hess
c827ddcdb6
typo 2020-03-25 13:20:24 -04:00
Joey Hess
a0d274fed6
Merge branch 'master' of ssh://git-annex.branchable.com 2020-03-25 13:05:47 -04:00
Joey Hess
357f783edf
add priority tags 2020-03-25 13:05:09 -04:00
spwhitton
79ba17946f Added a comment 2020-03-25 16:31:13 +00:00
yarikoptic
0397011792 initial report on failing gpg related tests inside singularity container 2020-03-25 00:01:36 +00:00
kyle
a51a94f616 bug: add --force-small submodule 2020-03-23 20:43:01 +00:00
ps
d23c0b0dd0 Added a comment: Solved 2020-03-23 19:07:54 +00:00
ps
c9e4a3a878 2020-03-23 16:51:48 +00:00
ps
6aa8ef340a 2020-03-23 16:48:57 +00:00
ps
01ad6eb9c3 2020-03-23 16:44:31 +00:00
kyle
4944b1bd13 Added a comment 2020-03-20 17:34:03 +00:00
Joey Hess
bbe977a2b6
fsck: Fix reversion in 8.20200226 that made it incorrectly warn that hashed keys with an extension should be upgraded. 2020-03-20 13:09:16 -04:00
Joey Hess
6222277179
Merge branch 'master' of ssh://git-annex.branchable.com 2020-03-20 12:51:39 -04:00
Joey Hess
4b92bbe8d7
webdav: Made exporttree remotes faster by caching connection to the server
Followed example of Remote.S3.
2020-03-20 12:48:43 -04:00
kyle
903b8348c9 Added a comment: comment: introduced by 09df58c4e 2020-03-20 16:20:05 +00:00
Joey Hess
24255b3c96
confirmed, and open todo for something mentioned in this bug 2020-03-20 12:00:07 -04:00
Joey Hess
82ee256525
Merge branch 'master' of ssh://git-annex.branchable.com 2020-03-20 11:48:18 -04:00
Joey Hess
2e6e8aa60a
fix windows build some more 2020-03-20 11:47:09 -04:00
mdemunck@6c26b2316205b7bc1125c6cbd3bc63bdb9e1cfad
42dcf48fbb 2020-03-20 09:08:08 +00:00
thk
677e5f6e12 Added a comment: sponsoring? 2020-03-19 08:40:32 +00:00
kyle
83a5467e93 sync adjusted submodule commit 2020-03-18 02:18:03 +00:00
thk
6eacb3e170 2020-03-17 20:45:59 +00:00
kyle
e19d2d75c5 Added a comment 2020-03-17 02:38:16 +00:00
kyle
ed4d4e5d6f Added a comment 2020-03-17 02:35:49 +00:00
lasitus
abb027a269 Added a comment 2020-03-17 02:15:13 +00:00
lasitus
fee3203723 Added a comment 2020-03-16 22:29:31 +00:00
thk
fb60296885 2020-03-16 20:47:16 +00:00
thk
df9957823f Added a comment: Please close 2020-03-16 20:46:27 +00:00
thk
cf48c140cf Added a comment 2020-03-16 20:42:55 +00:00
yarikoptic
6be7666f9e Added a comment 2020-03-16 19:54:42 +00:00
kyle
7e50500b7c Added a comment: reply: disconnected archive 2020-03-16 18:56:13 +00:00
Joey Hess
73289afdab
comment 2020-03-16 14:37:57 -04:00
Joey Hess
079656e69c
comment 2020-03-16 14:26:34 -04:00