Commit graph

29303 commits

Author SHA1 Message Date
Joey Hess
6f78497572
When adding files to an adjusted branch set up by --unlock-present, add them unlocked, not locked
Missed this when implementing it because of the default case catching
the new constructor. So, removed that default case to make sure
future types of adjusted branches don't make the same mistake.

Complicated by git-annex addurl --fast which adds the file whose content
is not present, so it needs to stay unlocked when on such a branch.

This commit was sponsored by Brock Spratlen on Patreon.
2021-01-28 12:47:46 -04:00
Joey Hess
db1e6c0625
close 2021-01-28 12:42:05 -04:00
Joey Hess
133177b231
close 2021-01-28 12:40:04 -04:00
Joey Hess
e3224ff77d
formatLsTree did not use a tab where git does
Fixed that, and made parserLsTree accept the space as well as tab.

Fixes a reversion that made import of a tree from a special remote result in
a merge that deleted files that were not preferred content of that special
remote.
2021-01-28 12:36:37 -04:00
Joey Hess
3b8fcefb45
add news item for git-annex 8.20210127 2021-01-27 11:14:12 -04:00
Joey Hess
d4a3f856e9
rename forum post ending in a dot which breaks cloning on windows 2021-01-26 13:19:05 -04:00
Joey Hess
b372d962ae
Added GETGITREMOTENAME to extenal special remote protocol 2021-01-26 12:42:47 -04:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
5db7c3c8b6 Added a comment: Unless the key is the argument to set 2021-01-26 16:12:31 +00:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
4246a5eaba Added a comment: -- works between the value and the option 2021-01-26 16:10:23 +00:00
edward
201bd6f318 Remove broken link. 2021-01-26 16:01:58 +00:00
Joey Hess
a11dad646c
Merge branch 'master' of ssh://git-annex.branchable.com 2021-01-26 11:32:52 -04:00
Joey Hess
8a8491b5b9
update 2021-01-26 11:32:40 -04:00
Joey Hess
4d8ce4464f
add 2021-01-26 11:27:14 -04:00
hello@6d9a437cebceb2fc657f93c4f30a7ba859e9309c
8d3bc1d3cb Added a comment: Other benefits of proposed improvements to the smudge/clean API 2021-01-26 14:25:59 +00:00
Joey Hess
bfa85ce64e
Merge branch 'master' of ssh://git-annex.branchable.com 2021-01-25 21:51:28 -04:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
d72c5cc337 2021-01-26 01:05:19 +00:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
7d08785c82 2021-01-26 01:04:13 +00:00
Joey Hess
47338bf270
support modifying and running git add on an unlocked file that used an URL key
Avoids the smudge --clean filter failing because URL keys do not support
genKey. Instead the modified content will be added using the default
backend.

This commit was sponsored by Jochen Bartl on Patreon.
2021-01-25 17:37:16 -04:00
Joey Hess
df70b307c4
bug 2021-01-25 16:08:30 -04:00
Joey Hess
b63e3118d7
fix export overwrite on FAT
Don't accept the cid of the temp file that the content has just been
written to as something we will accept if another file has that same
content. There's no reason to, and on FAT, due to mtime resolution,
the test suite hit just such a case.

This fixes a reversion from 73df633a62
which removed inode from the ContentIdentifier.
2021-01-25 13:31:17 -04:00
yarikoptic
519aca27a8 Added a comment 2021-01-25 16:49:36 +00:00
jwodder
095cfc53bd 2021-01-25 16:47:34 +00:00
Joey Hess
9e1a797fb7
comment 2021-01-25 12:31:47 -04:00
Joey Hess
9f1cdcd9de
comment 2021-01-25 12:04:07 -04:00
Joey Hess
6a3e505cdc
Merge branch 'master' of ssh://git-annex.branchable.com 2021-01-25 11:31:46 -04:00
Joey Hess
bcf7e78a3f
notabug 2021-01-25 11:20:46 -04:00
yarikoptic
f3ff2b83ca Added a comment 2021-01-25 15:18:40 +00:00
kyle
b6dec14e7a Added a comment 2021-01-25 14:52:54 +00:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
f1a9e88c96 Add positive stuff 2021-01-24 23:24:32 +00:00
seanl@fe5df935169a5440a52bdbfc5fece85cdd002d68
5d4a1b1cfa 2021-01-24 23:19:36 +00:00
m15
bcab80b508 Added a comment: bug report 2021-01-23 08:52:14 +00:00
Joey Hess
542f420f2c
comment 2021-01-22 14:56:18 -04:00
Joey Hess
e1a43ab097
followup 2021-01-22 14:36:34 -04:00
Joey Hess
9b2084f29a
fix problem on windows with newly rewritten prop_relPathDirToFileAbs_basics
Seems that dropDrive on windows only drops eg c:/ but not a leading /
while on linux, it does drop a leading / (which is what it considers
to be equivilant to a drive letter. I had been relying on it to drop
both. So need to drop leading directory separators.

Also, if the quickcheck generated input is eg "c:c:c:c:foo",
dropDrive will only drop the first one, leaving a path that's
still not relative. So instead of using dropDrive, just remove the
colons from the path.
2021-01-22 14:30:48 -04:00
Joey Hess
551ac2bdf9
Merge branch 'master' of ssh://git-annex.branchable.com 2021-01-22 14:05:49 -04:00
Joey Hess
5c7e6629cf
Fix a bug in view filename generation when a metadata value ended with "/"
Or ":" or "\" on Windows, eg "c:" again.
2021-01-22 14:05:14 -04:00
yarikoptic
7784046109 initial report on export_import fail 2021-01-22 16:50:58 +00:00
yarikoptic
d8722af2f3 Added a comment 2021-01-22 16:44:58 +00:00
yarikoptic
587795891b Added a comment 2021-01-22 16:42:32 +00:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
0ea9539e0a Added a comment 2021-01-22 11:08:38 +00:00
yarikoptic
aa07e68ede Added a comment 2021-01-22 01:47:46 +00:00
Joey Hess
95cd49abdb
fix a bug that prevented git-annex init from working in a submodule
This is probably a reversion, but not sure what caused it. By the time
Annex.Init runs fixupUnusualReposAfterInit, another git-annex process has
at least sometimes already done the necessary fixups. (Eg, one run
indirectly by a git command.) But since the Repo is cached, it doesn't
realize and does them again. So, avoid crashing when git config --unset
fails.

This commit was sponsored by Jack Hill on Patreon.
2021-01-21 15:33:15 -04:00
Joey Hess
7482c093cc
comment 2021-01-21 15:25:46 -04:00
yarikoptic
734be1260a Added a comment 2021-01-21 18:36:50 +00:00
Joey Hess
954816f1eb
comment 2021-01-21 13:19:40 -04:00
yarikoptic
9f2ab66e06 adjusted report with more of not so deep thoughts/observation ;) 2021-01-21 03:30:07 +00:00
yarikoptic
cccc05ff30 initial plea for considering credentials upon 404 of /config 2021-01-21 03:26:09 +00:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
a39b2beda7 2021-01-20 17:36:20 +00:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
9a29eba1f9 Added a comment 2021-01-20 15:41:50 +00:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
7762f8be37 Added a comment 2021-01-19 18:16:28 +00:00