git-annex.git
6 years agocomment
Joey Hess [Wed, 8 Jan 2020 18:26:48 +0000 (14:26 -0400)]
comment

6 years agoresponse
Joey Hess [Wed, 8 Jan 2020 18:25:26 +0000 (14:25 -0400)]
response

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 8 Jan 2020 18:24:10 +0000 (14:24 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoAdded a comment: git-annex in docker on Windows
Ilya_Shlyakhter [Wed, 8 Jan 2020 16:16:32 +0000 (16:16 +0000)]
Added a comment: git-annex in docker on Windows

6 years agofix a transcription error - to disable a remote, we set ignore to true, not false!
anarcat [Wed, 8 Jan 2020 15:30:51 +0000 (15:30 +0000)]
fix a transcription error - to disable a remote, we set ignore to true, not false!

6 years agoAdded a comment: WSL 1/2 experience
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec [Wed, 8 Jan 2020 15:20:07 +0000 (15:20 +0000)]
Added a comment: WSL 1/2 experience

6 years agoAdded a comment
fasthans@87884c78197fe1a25ac25ae7fa1d930c147e9592 [Wed, 8 Jan 2020 12:08:23 +0000 (12:08 +0000)]
Added a comment

6 years agoremoved
undral [Wed, 8 Jan 2020 00:17:47 +0000 (00:17 +0000)]
removed

6 years agoAdded a comment: hi
undral [Wed, 8 Jan 2020 00:17:14 +0000 (00:17 +0000)]
Added a comment: hi

6 years agogeneralize docs so they will also work when git uses SHA256
Joey Hess [Tue, 7 Jan 2020 20:10:57 +0000 (16:10 -0400)]
generalize docs so they will also work when git uses SHA256

6 years agoresponse
Joey Hess [Tue, 7 Jan 2020 19:33:29 +0000 (15:33 -0400)]
response

6 years agoresponse
Joey Hess [Tue, 7 Jan 2020 19:28:20 +0000 (15:28 -0400)]
response

6 years agoAdded a comment: prior research
fasthans@87884c78197fe1a25ac25ae7fa1d930c147e9592 [Tue, 7 Jan 2020 19:07:17 +0000 (19:07 +0000)]
Added a comment: prior research

6 years ago(no commit message)
fasthans@87884c78197fe1a25ac25ae7fa1d930c147e9592 [Tue, 7 Jan 2020 19:04:32 +0000 (19:04 +0000)]

6 years agoplan
Joey Hess [Tue, 7 Jan 2020 18:27:53 +0000 (14:27 -0400)]
plan

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 7 Jan 2020 17:26:14 +0000 (13:26 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agouse --no-abbrev instead of --abbrev=40
Joey Hess [Tue, 7 Jan 2020 16:29:37 +0000 (12:29 -0400)]
use --no-abbrev instead of --abbrev=40

This avoids hardcoding the sha size, so when git uses sha256, it will
output the full sha256 and not a truncation to 40 characters.

I reviewed git's history, and while there have been some
bugs with commands not supporting --no-abbrev (eg git diff --no-index
--no-abbrev was broken in git 2.1), none of the commands git-annex
uses will be impacted by those old bugs.

6 years agosupport sha256 git repos
Joey Hess [Tue, 7 Jan 2020 15:35:17 +0000 (11:35 -0400)]
support sha256 git repos

Git will eventually switch to sha2 and there will not be one single
shaSize anymore, but two (40 and 64).

Changed all parsers for git plumbing output to support both sizes of
shas.

One potential problem this does not deal with is, if somewhere in
git-annex it reads two shas from different sources, and compares them
to see if they're the same sha, it would fail if they're sha1 and sha256
of the same value. I don't know if that will really be a concern.

6 years agoAdded a comment
spwhitton [Tue, 7 Jan 2020 12:29:49 +0000 (12:29 +0000)]
Added a comment

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 6 Jan 2020 19:40:48 +0000 (15:40 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 19:39:50 +0000 (15:39 -0400)]
comment

6 years agofix typo in close
Joey Hess [Mon, 6 Jan 2020 19:35:11 +0000 (15:35 -0400)]
fix typo in close

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 19:33:06 +0000 (15:33 -0400)]
comment

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 19:29:51 +0000 (15:29 -0400)]
comment

6 years agoAdded a comment
yarikoptic [Mon, 6 Jan 2020 19:27:23 +0000 (19:27 +0000)]
Added a comment

6 years agoclose, redundant
Joey Hess [Mon, 6 Jan 2020 18:44:37 +0000 (14:44 -0400)]
close, redundant

6 years agocomment and close
Joey Hess [Mon, 6 Jan 2020 18:42:40 +0000 (14:42 -0400)]
comment and close

6 years agocomments
Joey Hess [Mon, 6 Jan 2020 18:33:29 +0000 (14:33 -0400)]
comments

6 years agoreinject --known: Fix bug that prevented it from working in a bare repo.
Joey Hess [Mon, 6 Jan 2020 18:22:22 +0000 (14:22 -0400)]
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.

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 17:59:03 +0000 (13:59 -0400)]
comment

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 17:24:39 +0000 (13:24 -0400)]
comment

6 years agoupdate
Joey Hess [Mon, 6 Jan 2020 17:06:10 +0000 (13:06 -0400)]
update

Removed some encoding issues that I think are no longer a problem.

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 17:06:06 +0000 (13:06 -0400)]
comment

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 6 Jan 2020 16:55:26 +0000 (12:55 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoimprove comment
Joey Hess [Mon, 6 Jan 2020 16:53:09 +0000 (12:53 -0400)]
improve comment

6 years agocomment
Joey Hess [Mon, 6 Jan 2020 16:52:59 +0000 (12:52 -0400)]
comment

6 years agoAdded a comment: Would you accept a patch implementing an annex.autocommit gitattribute?
AdamSpiers [Mon, 6 Jan 2020 16:12:54 +0000 (16:12 +0000)]
Added a comment: Would you accept a patch implementing an annex.autocommit gitattribute?

6 years ago(no commit message)
AdamSpiers [Mon, 6 Jan 2020 15:47:14 +0000 (15:47 +0000)]

6 years agouse conversion functions from filepath-bytestring (again)
Joey Hess [Sun, 5 Jan 2020 00:18:40 +0000 (20:18 -0400)]
use conversion functions from filepath-bytestring (again)

This reverts commit 3a04af7927afaac9aa65e65157201c35304df964.

6 years agoa new TODO for having windows build with MagicMime
yarikoptic [Sat, 4 Jan 2020 04:25:48 +0000 (04:25 +0000)]
a new TODO for having windows build with MagicMime

6 years agosimplfy unix-compat dep
Joey Hess [Thu, 2 Jan 2020 16:18:38 +0000 (12:18 -0400)]
simplfy unix-compat dep

6 years agodevblog
Joey Hess [Wed, 1 Jan 2020 19:16:07 +0000 (15:16 -0400)]
devblog

6 years agocomment
Joey Hess [Wed, 1 Jan 2020 19:04:37 +0000 (15:04 -0400)]
comment

6 years agocomments
Joey Hess [Wed, 1 Jan 2020 19:03:01 +0000 (15:03 -0400)]
comments

6 years agofix comment location
Joey Hess [Wed, 1 Jan 2020 18:52:16 +0000 (14:52 -0400)]
fix comment location

6 years agoavoid build warning on windows
Joey Hess [Wed, 1 Jan 2020 18:40:00 +0000 (14:40 -0400)]
avoid build warning on windows

6 years agoupdate comments to point to conversion docs
Joey Hess [Wed, 1 Jan 2020 18:38:40 +0000 (14:38 -0400)]
update comments to point to conversion docs

want to avoid use of -c annex.largefiles..

6 years agofix windows build
Joey Hess [Wed, 1 Jan 2020 18:27:03 +0000 (14:27 -0400)]
fix windows build

6 years agocomment
Joey Hess [Wed, 1 Jan 2020 18:26:58 +0000 (14:26 -0400)]
comment

6 years agoadd --force-annex/--force-git
Joey Hess [Wed, 1 Jan 2020 18:03:06 +0000 (14:03 -0400)]
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.

6 years agowindows build fix
Joey Hess [Wed, 1 Jan 2020 17:46:03 +0000 (13:46 -0400)]
windows build fix

6 years agowindows build fix
Joey Hess [Wed, 1 Jan 2020 17:12:33 +0000 (13:12 -0400)]
windows build fix

6 years agowindows build fix
Joey Hess [Wed, 1 Jan 2020 17:05:23 +0000 (13:05 -0400)]
windows build fix

6 years agowindows build fix
Joey Hess [Wed, 1 Jan 2020 16:24:31 +0000 (12:24 -0400)]
windows build fix

6 years agoforce move
Joey Hess [Tue, 31 Dec 2019 22:09:17 +0000 (18:09 -0400)]
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.

6 years agoupdate for RawFilePath changes
Joey Hess [Tue, 31 Dec 2019 22:01:53 +0000 (18:01 -0400)]
update for RawFilePath changes

6 years ago(no commit message)
cdl+git-annex@b0d37ee10004bd40b9b1bda4c5d4eeec3bde3981 [Tue, 31 Dec 2019 02:05:11 +0000 (02:05 +0000)]

6 years agoAdded a comment: named pipes and external remotes
Ilya_Shlyakhter [Tue, 31 Dec 2019 01:38:03 +0000 (01:38 +0000)]
Added a comment: named pipes and external remotes

6 years ago(no commit message)
cdl+git-annex@b0d37ee10004bd40b9b1bda4c5d4eeec3bde3981 [Mon, 30 Dec 2019 19:25:31 +0000 (19:25 +0000)]

6 years agoadd news item for git-annex 7.20191230
Joey Hess [Mon, 30 Dec 2019 18:50:15 +0000 (14:50 -0400)]
add news item for git-annex 7.20191230

6 years agoreleasing package git-annex version 7.20191230
Joey Hess [Mon, 30 Dec 2019 18:49:31 +0000 (14:49 -0400)]
releasing package git-annex version 7.20191230

6 years agocomment
Joey Hess [Mon, 30 Dec 2019 18:36:04 +0000 (14:36 -0400)]
comment

6 years agofix quickcheck failure
Joey Hess [Mon, 30 Dec 2019 17:54:46 +0000 (13:54 -0400)]
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.

6 years agoif hdiutil create never succeeds, fail the build
Joey Hess [Mon, 30 Dec 2019 17:06:43 +0000 (13:06 -0400)]
if hdiutil create never succeeds, fail the build

Build was succeeding despite the dmg never being created.

6 years agodifferent way to avoid NUL in Arbitrary AssociatedFile
Joey Hess [Mon, 30 Dec 2019 16:27:45 +0000 (12:27 -0400)]
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.

6 years agoadjust filepath-bytestring deps
Joey Hess [Mon, 30 Dec 2019 15:43:15 +0000 (11:43 -0400)]
adjust filepath-bytestring deps

cabal needs to support the old one for debian currently, but stack can
require the newer one

6 years ago(no commit message)
qiang.fang@ddaed0de00c2925f8036e6c61ce6e12654263ada [Mon, 30 Dec 2019 13:22:39 +0000 (13:22 +0000)]

6 years agoAdded a comment: Duplicate 'gcrypt-id' may be the issue?
sirio@84e81889437b3f6208201a26e428197c6045c337 [Sun, 29 Dec 2019 22:10:26 +0000 (22:10 +0000)]
Added a comment: Duplicate 'gcrypt-id' may be the issue?

6 years agoAdded a comment
kyle [Sat, 28 Dec 2019 21:06:46 +0000 (21:06 +0000)]
Added a comment

6 years agotemporary revert "use conversion functions from filepath-bytestring"
Joey Hess [Fri, 27 Dec 2019 23:29:09 +0000 (19:29 -0400)]
temporary revert "use conversion functions from filepath-bytestring"

This reverts commit 75c40279c1600da157c2ba0981989da9eaf1c502.

Debian unstable is one version too old, so this can be de-reverted in a
bit.

6 years agoadd filepath-bytestring
Joey Hess [Fri, 27 Dec 2019 19:20:46 +0000 (15:20 -0400)]
add filepath-bytestring

6 years agoadd libghc-filepath-bytestring-dev build dep
Joey Hess [Fri, 27 Dec 2019 19:10:11 +0000 (15:10 -0400)]
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.

6 years agoclose
Joey Hess [Fri, 27 Dec 2019 19:08:11 +0000 (15:08 -0400)]
close

6 years agofix a case where file tracked by git unexpectedly becomes annex pointer file
Joey Hess [Fri, 27 Dec 2019 18:58:10 +0000 (14:58 -0400)]
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.

6 years agocomment
Joey Hess [Fri, 27 Dec 2019 18:52:19 +0000 (14:52 -0400)]
comment

6 years agoupdate on variant
Joey Hess [Fri, 27 Dec 2019 17:17:53 +0000 (13:17 -0400)]
update on variant

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 27 Dec 2019 16:47:32 +0000 (12:47 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agofollowup
Joey Hess [Fri, 27 Dec 2019 07:04:23 +0000 (03:04 -0400)]
followup

6 years ago(no commit message)
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e [Fri, 27 Dec 2019 00:47:46 +0000 (00:47 +0000)]

6 years ago(no commit message)
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e [Fri, 27 Dec 2019 00:47:03 +0000 (00:47 +0000)]

6 years agoimplelented in v8
Joey Hess [Thu, 26 Dec 2019 20:39:27 +0000 (16:39 -0400)]
implelented in v8

6 years agodidn't mean to commit this incomplete workaround
Joey Hess [Thu, 26 Dec 2019 19:07:50 +0000 (15:07 -0400)]
didn't mean to commit this incomplete workaround

though I suppose it's nice to have it in the history..

6 years agoanalysis
Joey Hess [Thu, 26 Dec 2019 19:05:36 +0000 (15:05 -0400)]
analysis

6 years agoadded projects/datalad
yarikoptic [Tue, 24 Dec 2019 14:10:49 +0000 (14:10 +0000)]
added  projects/datalad

6 years agoAdded a comment: Workaround
https://christian.amsuess.com/chrysn [Sun, 22 Dec 2019 10:50:33 +0000 (10:50 +0000)]
Added a comment: Workaround

6 years agolink from bug report to submodules to make the affecting bug visible there
https://christian.amsuess.com/chrysn [Sun, 22 Dec 2019 10:02:23 +0000 (10:02 +0000)]
link from bug report to submodules to make the affecting bug visible there

6 years agoAdded a comment
spwhitton [Sat, 21 Dec 2019 23:03:46 +0000 (23:03 +0000)]
Added a comment

6 years agoadd workaround
spwhitton [Sat, 21 Dec 2019 22:20:31 +0000 (22:20 +0000)]
add workaround

6 years agoreport bug
spwhitton [Sat, 21 Dec 2019 22:11:38 +0000 (22:11 +0000)]
report bug

6 years agoreport difficulty encountered when using submodules
https://christian.amsuess.com/chrysn [Sat, 21 Dec 2019 20:40:44 +0000 (20:40 +0000)]
report difficulty encountered when using submodules

6 years agoAdded a comment: windows installer has not been updated to version 7.20191218
michael.fsp@85f5ea833fb457cf7b0b0181c314888d5f32649c [Sat, 21 Dec 2019 18:17:19 +0000 (18:17 +0000)]
Added a comment: windows installer has not been updated to version 7.20191218

6 years agofix copy/paste mistake
spwhitton [Sat, 21 Dec 2019 04:20:40 +0000 (04:20 +0000)]
fix copy/paste mistake

6 years agofile bug
spwhitton [Sat, 21 Dec 2019 04:19:56 +0000 (04:19 +0000)]
file bug

6 years agoImprove file ordering behavior when one parameter is "." and other parameters are...
Joey Hess [Fri, 20 Dec 2019 22:01:29 +0000 (18:01 -0400)]
Improve file ordering behavior when one parameter is "." and other parameters are other directories

eg, `git-annex get . ..` used to order the files strangly, because it
did not realize that when git ls-files output eg "foo", that should be
grouped with the first set of files and not the second set.

Fixed by making            dirContains "." "./foo" = True
which makes sense, because dirContains ".." "../foo" = True

6 years agocomment
Joey Hess [Fri, 20 Dec 2019 20:11:21 +0000 (16:11 -0400)]
comment

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 20 Dec 2019 19:58:15 +0000 (15:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoannex.addunlocked expressions
Joey Hess [Fri, 20 Dec 2019 19:01:34 +0000 (15:01 -0400)]
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.

6 years agoAdded a comment: oh hoh, there is mimeencoding now
yarikoptic [Fri, 20 Dec 2019 19:54:04 +0000 (19:54 +0000)]
Added a comment: oh hoh, there is mimeencoding now

6 years agoelaborated on my previous (marked "done") bug report about mimetypes
yarikoptic [Fri, 20 Dec 2019 19:50:24 +0000 (19:50 +0000)]
elaborated on my previous (marked "done") bug report about mimetypes

6 years agoimprove docs of addunlocked re adjusted branches
Joey Hess [Fri, 20 Dec 2019 17:19:36 +0000 (13:19 -0400)]
improve docs of addunlocked re adjusted branches