Commit graph

36093 commits

Author SHA1 Message Date
Joey Hess
491a2fd72f
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-06 12:55:26 -04:00
Joey Hess
36fd64533e
improve comment 2020-01-06 12:53:09 -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
AdamSpiers
0b7d11d033 2020-01-06 15:47:14 +00:00
Joey Hess
b68a8d8968
use conversion functions from filepath-bytestring (again)
This reverts commit 3a04af7927.
2020-01-04 20:18:40 -04:00
yarikoptic
d734068724 a new TODO for having windows build with MagicMime 2020-01-04 04:25:48 +00:00
Joey Hess
dfb25ecc29
simplfy unix-compat dep 2020-01-02 12:18:38 -04:00
Joey Hess
40ebeebd5f
devblog 2020-01-01 15:16:07 -04:00
Joey Hess
724514ccae
comment 2020-01-01 15:04:37 -04:00
Joey Hess
bc70a8b3f6
comments 2020-01-01 15:03:01 -04:00
Joey Hess
a234ad7368
fix comment location 2020-01-01 14:52:16 -04:00
Joey Hess
2000e9a4b8
avoid build warning on windows 2020-01-01 14:40:35 -04:00
Joey Hess
d0f3b01c31
update comments to point to conversion docs
want to avoid use of -c annex.largefiles..
2020-01-01 14:38:40 -04:00
Joey Hess
fb04cfd0e6
fix windows build 2020-01-01 14:27:03 -04:00
Joey Hess
f9782dd1b1
comment 2020-01-01 14:26:58 -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
Joey Hess
022dead40a
windows build fix 2020-01-01 13:46:03 -04:00
Joey Hess
f0b53d8465
windows build fix 2020-01-01 13:12:33 -04:00
Joey Hess
999a6f0541
windows build fix 2020-01-01 13:05:23 -04:00
Joey Hess
39c91f91a9
windows build fix 2020-01-01 12:24:31 -04:00
Joey Hess
85fc83eaf4
force move
Move will fail if the file is already on website and was re-downloaded
to generate rpms with, so force makes sure it moves.
2019-12-31 18:09:17 -04:00
Joey Hess
fa55a83206
update for RawFilePath changes 2019-12-31 18:01:53 -04:00
cdl+git-annex@b0d37ee10004bd40b9b1bda4c5d4eeec3bde3981
ef6d1e3276 2019-12-31 02:05:11 +00:00
Ilya_Shlyakhter
98b5762963 Added a comment: named pipes and external remotes 2019-12-31 01:38:03 +00:00
cdl+git-annex@b0d37ee10004bd40b9b1bda4c5d4eeec3bde3981
2b9172e981 2019-12-30 19:25:31 +00:00
Joey Hess
7696fc9a91
add news item for git-annex 7.20191230 2019-12-30 14:50:15 -04:00
Joey Hess
985373f8e7
releasing package git-annex version 7.20191230 2019-12-30 14:49:31 -04:00
Joey Hess
8ea9f1bc5c
comment 2019-12-30 14:36:04 -04:00
Joey Hess
e006acc8e3
fix quickcheck failure
prop_encode_decode_roundtrip failed on "\175" in C locale.

This may be a new problem after the switch to RawFilePath, but it
already had filtering for high chars, so changed to only test ascii
chars.
2019-12-30 13:54:46 -04:00
Joey Hess
91ec283be6
if hdiutil create never succeeds, fail the build
Build was succeeding despite the dmg never being created.
2019-12-30 13:06:43 -04:00
Joey Hess
70395659db
different way to avoid NUL in Arbitrary AssociatedFile
Test case has been intermittently failing, with an AssociatedFile that
somehow contains a NUL despite it being filtered out. My guess is
something to do with locales. This new approach should prevent any NUL
at all, although it does weigh the distribution a bit more toward
Nothing.
2019-12-30 12:27:45 -04:00
Joey Hess
6d10fecff4
adjust filepath-bytestring deps
cabal needs to support the old one for debian currently, but stack can
require the newer one
2019-12-30 11:43:15 -04:00
qiang.fang@ddaed0de00c2925f8036e6c61ce6e12654263ada
97d7c596ac 2019-12-30 13:22:39 +00:00
sirio@84e81889437b3f6208201a26e428197c6045c337
1383135f75 Added a comment: Duplicate 'gcrypt-id' may be the issue? 2019-12-29 22:10:26 +00:00
kyle
507a860e2e Added a comment 2019-12-28 21:06:46 +00:00
Joey Hess
3a04af7927
temporary revert "use conversion functions from filepath-bytestring"
This reverts commit 75c40279c1.

Debian unstable is one version too old, so this can be de-reverted in a
bit.
2019-12-27 19:29:09 -04:00
Joey Hess
023aa3d30f
add filepath-bytestring 2019-12-27 15:20:46 -04:00
Joey Hess
c08a38f5ee
add libghc-filepath-bytestring-dev build dep
Debian impressively packaged my new library before anyone even asked
them to, and before git-annex needed it.
2019-12-27 15:10:11 -04:00
Joey Hess
9a04e2c859
close 2019-12-27 15:08:11 -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
b9481c6ba0
comment 2019-12-27 14:52:19 -04:00
Joey Hess
ca4a200c2e
update on variant 2019-12-27 13:17:53 -04:00
Joey Hess
6ad4f2635d
Merge branch 'master' of ssh://git-annex.branchable.com 2019-12-27 12:47:32 -04:00
Joey Hess
1b71bc4330
followup 2019-12-27 03:04:23 -04:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
6f74b090ad 2019-12-27 00:47:46 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
3c756b8045 2019-12-27 00:47:03 +00:00
Joey Hess
4176b335a6
implelented in v8 2019-12-26 16:39:27 -04:00
Joey Hess
de14a7bab5
didn't mean to commit this incomplete workaround
though I suppose it's nice to have it in the history..
2019-12-26 15:07:50 -04:00
Joey Hess
293f95c2d6
analysis 2019-12-26 15:05:36 -04:00