mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2019-01-01 16:42:29 -04:00
commit 24d6ec40dc
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_9_ab4b7a243f9d1dfddf1c2c2609863d99._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 9"
date="2019-01-01T19:00:07Z"
content="""
I believe all repos are created at v5 by default currently both from the command-line and the assistant webapp, but there is no guarantee that will always be the case. With the latest version of git-annex a v6 repo will automatically be upgraded to a v7 repo whenever you run any git-annex command (or start the assistant or webapp).
Also just for help troubleshooting Joey: I just tested this with `6.20180914-g13dc117e9` and v6 indirect repos. Same issue, files moved to an archive folder (unlocked and locked) are never dropped by the assistant even after they have reached an archive repo. As with v7 repos, running `git-annex drop --auto` does drop them.
"""]]

1
doc/bugs/import_--force_does_not_operate_on_locked_files.mdwn Normal file
View file

@ -0,0 +1 @@
`git-annex import --force` does not work on locked files (only unlocked files). Running `7.20181106-g352f88226` on macOS 10.12.6

14
doc/bugs/impossible_to_login_to_the_website_at_times/comment_5_c76fddc3aab4d3580c79f105c97d6998._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 5"
date="2019-01-01T18:47:58Z"
content="""
OK. I think I have figured out the issue (at least in my case). I guess that I had logged into https://git-annex.branchable.com, then tried to visit the non-secure URL http://git-annex.branchable.com this is when I got the error.
Taking a look at the cookie I send when visiting https://git-annex.branchable.com I see that it has the secure flag set. Which I think means that my browser will refuse to send this cookie when I visit the http://git-annex.branchable.com and will refuse to receive another cookie (since its the same domain).
If I clear my cookies and login via http://git-annex.branchable.com, the cookie does not have the secure flag set.
This means that ikiwiki is serving cookies with different flags for http vs https. Probably related to this feature? <https://ikiwiki.info/todo/use_secure_cookies_for_ssl_logins/>. Anyhow it seems this isn't quite working as desired. I think it is possible to serve two different cookies (one for http and one for https) but ikiwiki does not appear to be doing that.
"""]]

23
doc/forum/git-annex-import_questions/comment_1_e353e5ae20ba379c42fb39825c57147e._comment Normal file
View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 1"
date="2019-01-01T19:36:35Z"
content="""
* files are imported recursively into the directory you call `git-annex import` from
* What happens if two files with same basenames but different contents are imported from different paths: git-annex will skip importing these files unless you specify --force
* When you import a directory, does this recursively import the full tree under it?: yes
* Also, just to note, the command name may be confusing to users, because (5) it deletes the original files by default, which most import commands do not do: see discussion here: <http://git-annex.branchable.com/bugs/Importing__95__Commands__95__Destructive__95__by__95__default/>
* it is unrelated to git-annex-export: the intent is for it to eventually be related to export, see TODO here: <http://git-annex.branchable.com/todo/import_tree/>
And I don't know about your `--batch` question.
With your `import a file into the annex only, without creating a symlink to it from the working copy` question:
You could do:
git annex calckey path-of-file-not-in-repo
git annex setkey key-from-previous-command path-of-file-not-in-repo
But perhaps if this is generally useful there could be a `git annex reinject --unknown` command added to git-annex, or a `--import-keys-only` command added to `import`.
"""]]

11
doc/git-annex-unlock/comment_3_516a1522db3d1c14cc5131a24d672a8f._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="chocolate.camera@ec2ecab153906be21ac5f36652c33786ad0e0b60"
nickname="chocolate.camera"
avatar="http://cdn.libravatar.org/avatar/4f00dfc3ad590ef7492788b854ceba78"
subject="comment 3"
date="2019-01-01T18:17:21Z"
content="""
The page about [unlocked files](https://git-annex.branchable.com/tips/unlocked_files/) says:
> setting annex.thin only has any effect on systems that support hard links. It is supported on Windows, but not on FAT filesystems.
"""]]

26
doc/todo/git_repo_tracking___40__not_storage__41__/comment_1_e47bc088880a9e839f5c437117c58b68._comment Normal file
View file

@ -0,0 +1,26 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 1"
date="2019-01-01T20:02:57Z"
content="""
#1
*|| Drop a repo for space if the current commit is available in at least N remotes (and all of the repo state is pushed/clean).*
Did you mean \"drop a remote for space\"? If so there are already a lot of ways of conditionally dropping content from remotes or locally.
#2
*|| Create branches or tags in an annex that collect a set of version-compatible checkouts for related projects. The commit/tag messages provide a natural place for meta-commentary*
You can create branches or tags in an annex and check them out as needed. The working directory always just refers to content in the .git/annex directory which would be shared across all branches.
#3
*|| Save and version files that aren't quite junk but don't belong in a repo (logs, dumps, backups, editor project/workspace files, notes/to-do lists, build-artifacts, test-coverage/linter stat databases, shell history) alongside the repo, making it easier to have a consistent environment for working on one project across multiple systems.*
Couldn't you put these in another branch? Or add [metadata](https://git-annex.branchable.com/design/metadata/) to track them separately and use [metadata driven views](https://git-annex.branchable.com/tips/metadata_driven_views/).
#4
*|| Make separate system-specific \"master\" branches for the main projects directory on each system, then edit and push changes from any other. For example, prep the projects directory on an infrequently-used laptop from your desktop and push/pull the changes.*
You can use any commands that work with git to manage your working directory including branches.
"""]]