Commit graph

2858 commits

Author SHA1 Message Date
Joey Hess
8aa6f60fc3
plan 2020-01-07 14:27:53 -04:00
spwhitton
6a47c66388 Added a comment 2020-01-07 12:29:49 +00:00
Joey Hess
b5fc1b97f7
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-06 15:40:48 -04:00
Joey Hess
6db883d6db
comment 2020-01-06 15:39:50 -04:00
Joey Hess
1bd7ec6f06
fix typo in close 2020-01-06 15:35:11 -04:00
Joey Hess
4bb3d76c8c
comment 2020-01-06 15:33:06 -04:00
Joey Hess
0cb3bcbcb5
comment 2020-01-06 15:29:51 -04:00
yarikoptic
aec7892a9f Added a comment 2020-01-06 19:27:23 +00:00
Joey Hess
128ecac047
close, redundant 2020-01-06 14:44:37 -04:00
Joey Hess
6456672feb
comment and close 2020-01-06 14:42:40 -04:00
Joey Hess
ba0150ebba
comments 2020-01-06 14:33:29 -04:00
Joey Hess
2de3dddfd2
reinject --known: Fix bug that prevented it from working in a bare repo.
ifAnnexed in a bare repo passes to git cat-file :./filename , which it
refuses to do since the repo is bare.

Note that, reinject somefile someannexedfile in a bare repo silently does
nothing, because someannexedfile is never actually an annexed worktree
file, because the repo is bare.
2020-01-06 14:22:22 -04:00
Joey Hess
d9ed94f15b
comment 2020-01-06 13:59:03 -04:00
Joey Hess
84960da522
comment 2020-01-06 13:24:39 -04:00
Joey Hess
a9086df1e7
update
Removed some encoding issues that I think are no longer a problem.
2020-01-06 13:06:10 -04:00
Joey Hess
0c904bdf5d
comment 2020-01-06 13:06:06 -04:00
Joey Hess
491a2fd72f
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-06 12:55:26 -04:00
Joey Hess
d19dbdb05e
comment 2020-01-06 12:52:59 -04:00
AdamSpiers
d5ab0ec1cc Added a comment: Would you accept a patch implementing an annex.autocommit gitattribute? 2020-01-06 16:12:54 +00:00
yarikoptic
d734068724 a new TODO for having windows build with MagicMime 2020-01-04 04:25:48 +00:00
Joey Hess
bc70a8b3f6
comments 2020-01-01 15:03:01 -04:00
Joey Hess
503788238c
add --force-annex/--force-git
options make it easier to override annex.largefiles configuration
(and potentially safer as it avoids bugs like the smudge bug fixed
in the last release)

Deleted some old comments that were posted to the man page discussing such
options.

Updated docs that used -c annex.largefiles to use the options.

Note that addSmallOverridden was needed to avoid the clean filter running
on the file. It would be possible to make addFile also update the index
directly, rather than going via git add. However, it was not necessary,
and I want to avoid breaking on some edge case, particularly if the code in
addSmallOverridden has some oversight.

Also, when annex.addunlocked is set and annex.largefiles does not match a file,
git annex add --force-large works, but git status will then show the file
as added, with a unstaged modification. The unstaged modification adds the
file to git. This is identical behavior to using -c annex.largefiles=nothing
when annex.addunlocked is set. This does not prevent committing what was
intended to be added. I have not gotten to the bottom of why git thinks
the file is modified and runs it through the clean filter in this case.
2020-01-01 14:03:06 -04:00
Ilya_Shlyakhter
98b5762963 Added a comment: named pipes and external remotes 2019-12-31 01:38:03 +00:00
Joey Hess
8ea9f1bc5c
comment 2019-12-30 14:36:04 -04:00
Joey Hess
ea3cb7d277
fix a case where file tracked by git unexpectedly becomes annex pointer file
smudge: When annex.largefiles=anything, files that were already stored in
git, and have not been modified could sometimes be converted to being
stored in the annex. Changes in 7.20191024 made this more of a problem.
This case is now detected and prevented.
2019-12-27 15:08:03 -04:00
Joey Hess
4176b335a6
implelented in v8 2019-12-26 16:39:27 -04:00
spwhitton
d107ce1e77 Added a comment 2019-12-21 23:03:46 +00:00
spwhitton
01b8eb5e3d add workaround 2019-12-21 22:20:31 +00:00
spwhitton
72c5f9132c report bug 2019-12-21 22:11:38 +00:00
spwhitton
1a5e29c47c fix copy/paste mistake 2019-12-21 04:20:40 +00:00
spwhitton
501492a40a file bug 2019-12-21 04:19:56 +00:00
Joey Hess
37467a008f
annex.addunlocked expressions
* annex.addunlocked can be set to an expression with the same format used by
  annex.largefiles, in case you want to default to unlocking some files but
  not others.
* annex.addunlocked can be configured by git-annex config.

Added a git-annex-matching-expression man page, broken out from
tips/largefiles.

A tricky consequence of this is that git-annex add --relaxed
honors annex.addunlocked, but an expression might want to know the size
or content of an url, which it's not going to download. I decided it was
better not to fail, and just dummy up some plausible data in that case.

Performance impact should be negligible. The global config is already
loaded for annex.largefiles. The expression only has to be parsed once,
and in the simple true/false case, it should not do any additional work
matching it.
2019-12-20 15:56:25 -04:00
Joey Hess
7d50e98646
thought 2019-12-19 16:44:08 -04:00
Joey Hess
e8651fbd09
comment 2019-12-19 13:39:08 -04:00
Joey Hess
37db1fa5a0
Merge branch 'bs' 2019-12-19 13:12:39 -04:00
Joey Hess
96a8b2d095
typo 2019-12-19 12:52:56 -04:00
Joey Hess
2e34516e6a
formatting 2019-12-19 12:52:12 -04:00
Joey Hess
09272507c1
comment 2019-12-19 12:50:34 -04:00
Joey Hess
67ae6ddecb
comment 2019-12-19 12:06:59 -04:00
Joey Hess
686791c4ed
more RawFilePath
Remove dup definitions and just use the RawFilePath one. </> etc are
enough faster that it's probably faster than building a String directly,
although I have not benchmarked.
2019-12-18 17:10:28 -04:00
Joey Hess
9e9def2dc0
todo 2019-12-18 16:11:18 -04:00
Joey Hess
7b7e0d8a86
wrap up 2019-12-18 15:19:19 -04:00
Joey Hess
7d9dff5b05
Merge branch 'master' into bs
and update changelog
2019-12-18 15:13:30 -04:00
Ilya_Shlyakhter
f2052f67fb Added a comment: named pipes as destination files 2019-12-18 18:41:57 +00:00
Joey Hess
7fd5376334
inprogress: Support --key 2019-12-18 14:14:16 -04:00
Joey Hess
92c566f1b2
comment 2019-12-18 13:52:43 -04:00
Joey Hess
c745fa2852
Merge branch 'master' into bs 2019-12-18 13:47:27 -04:00
Joey Hess
75c40279c1
use conversion functions from filepath-bytestring
Behavior should be the same, but I'd hope to eventually get rid of
most of Utility.FileSystemEncoding and this is a first step.
2019-12-18 13:42:43 -04:00
Joey Hess
0246ecbe94
update 2019-12-18 12:15:06 -04:00
Joey Hess
3d38ec9585
fix fileJournal
My ByteString rewrite oversimplified it, resulting in any _ in a journal
file turning into a / in the git-annex branch, which was often the wrong
filename, or sometimes (//) an invalid filename that git
refused to add.
2019-12-18 11:29:34 -04:00