Commit graph

44375 commits

Author SHA1 Message Date
Joey Hess
a55be6ed0e
update thanks and separate out 2023 name list 2024-02-15 13:24:32 -04:00
nobodyinperson
65839cfbac Suggest cooperating with hellotux.com for git-annex-branded shirts 2024-02-13 19:36:11 +00:00
Joey Hess
3475b09c3e
pre-commit: Avoid committing the git-annex branch
Except when a commit is made in a view, which changes metadata.

Make the assistant commit the git-annex branch after git commit of working
tree changes.

This allows using the annex.commitmessage-command in the assistant to
generate a commit message for the git-annex branch that relies on state
gathered during the commit of the working tree. Eg, it might reuse the
commit message.

Note that, when not using the assistant, a git-annex add still commits
the git-annex branch, so such a annex.commitmessage-command set up would
not work then. But if someone is using the assistant and wants
programmatic control over commit messages, this is useful. Someone not
using the assistant can get the same result by using annex.alwayscommit=false
during the git-annex add, and git-annex merge after they git commit.

pre-commit was never really intended to commit the git-annex branch
(except after recording changed metadata), but the assistant did sort of
rely on it. It does later commit the git-annex branch before pushing to
remotes, but I didn't want to risk building up lots of uncommitted changes
to it if that didn't happen frequently.

Sponsored-by: the NIH-funded NICEMAN (ReproNim TR&D3) project
2024-02-12 14:42:11 -04:00
Joey Hess
68e99513f0
added annex.commitmessage-command config
Sponsored-by: the NIH-funded NICEMAN (ReproNim TR&D3) project
2024-02-12 14:35:22 -04:00
Joey Hess
66919bf6ec
comment 2024-02-12 13:04:56 -04:00
yarikoptic
2832714af1 Added a comment 2024-02-11 18:54:45 +00:00
yarikoptic
6c7d7ae719 removed 2024-02-11 18:54:10 +00:00
yarikoptic
9e07eeaef3 Added a comment 2024-02-11 18:50:18 +00:00
Joey Hess
990b7bc3ef
top 2024-02-10 12:50:00 -04:00
Joey Hess
41cad8d9aa
improved approach 2024-02-10 12:24:06 -04:00
Joey Hess
6871ec36a7
remove comment that doesn't actually work 2024-02-10 12:05:19 -04:00
Joey Hess
dd0e45c86e
update 2024-02-10 11:24:32 -04:00
Joey Hess
fef7711dd3
comment 2024-02-10 11:19:47 -04:00
Joey Hess
8c4b94bb04
Merge branch 'master' of ssh://git-annex.branchable.com 2024-02-10 10:48:52 -04:00
Joey Hess
6c5aaa2b0f
design document for verified relaxed urls
Sponsored-by: Graham Spencer on Patreon
2024-02-10 10:48:20 -04:00
Joey Hess
aba87a6e92
close as distributed migration meets this use case 2024-02-10 10:24:58 -04:00
psxvoid
a8acc7a11c Added a comment: Update: workaround with branches 2024-02-10 10:53:56 +00:00
psxvoid
873c6c48ef Added a comment: This behavior should be the default one 2024-02-10 08:11:30 +00:00
yarikoptic
e99813cb67 Added a comment 2024-02-09 21:58:56 +00:00
Joey Hess
5e4d92efd5
comment 2024-02-09 17:04:04 -04:00
Joey Hess
eed66c0164
comment 2024-02-09 17:00:36 -04:00
Joey Hess
b68a319dab
Merge branch 'master' of ssh://git-annex.branchable.com 2024-02-09 14:19:55 -04:00
Joey Hess
bca66acfd8
comment 2024-02-09 14:09:49 -04:00
yarikoptic
dee690587c initial question on grafting the history when we have sensitive data 2024-02-09 17:54:01 +00:00
yarikoptic
2a4d7d894b Added a comment 2024-02-09 13:50:21 +00:00
yarikoptic
517914c0f6 Added a comment 2024-02-08 22:08:41 +00:00
Joey Hess
c3b29fcc17
update 2024-02-08 10:25:52 -04:00
Joey Hess
c4943ae277
close 2024-02-07 16:24:39 -04:00
Joey Hess
644317e86f
Merge branch 'master' of ssh://git-annex.branchable.com 2024-02-07 16:21:31 -04:00
Joey Hess
fa9197560d
move commitStaged out of Command.Sync which no longer uses it
It's trivial enough that it it's not worth factoring it out to somewhere
in common with Command.Undo and the assistant.

Sponsored-by: the NIH-funded NICEMAN (ReproNim TR&D3) project
2024-02-07 16:19:28 -04:00
Joey Hess
21123ba368
assistant, undo: When committing, let the usual git commit hooks run
Was doing a Git.Branch.commit for historical reasons to do with direct
mode, which no longer apply.

Note that the preCommitAnnexHook is no longer called in commitStaged
because git-annex installs a pre-commit hook that runs the pre-commit-annex
hook. And git commit will run the pre-commit hook.

Sponsored-by: the NIH-funded NICEMAN (ReproNim TR&D3) project
2024-02-07 16:15:35 -04:00
yarikoptic
3a0cbb8515 Added a comment 2024-02-07 18:47:19 +00:00
jstritch
d8df420b18 Added a comment 2024-02-07 15:52:18 +00:00
jstritch
08db730a17 Added a comment 2024-02-06 19:54:40 +00:00
jstritch
949f068fb7 Added a comment 2024-02-06 18:27:33 +00:00
jstritch
e0488d74ff Added a comment 2024-02-06 16:10:56 +00:00
Joey Hess
b2027da251
Revert "try aws-0.23 again with i386ancient"
This reverts commit 43d182a955.

In the dependencies for aws-0.23:
    aeson-1.3.1.1 from stack configuration does not match >=2.0.0.0  (latest matching version
                  is 2.1.2.1)

So this will never be able to be updated to aws-0.23 probably.
2024-02-06 11:24:10 -04:00
Joey Hess
43d182a955
try aws-0.23 again with i386ancient 2024-02-06 11:22:01 -04:00
Joey Hess
4f8fcf707d
stack.yaml: Update to lts-22.9 and use crypton. 2024-02-06 11:08:12 -04:00
Joey Hess
d41e6990c0
remove support for directory < 1.2.7
The build depends already require 1.2.7, so these old ifdefs must be
unnecessary.
2024-02-06 10:53:13 -04:00
zoran.bosnjak@683708e9d46ca9d9fa8957bd513e6648cbcbf421
8f00cca06e Added a comment: centralized repository workflow 2024-02-06 12:33:20 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
42558c3c8c 2024-02-05 20:40:01 +00:00
Joey Hess
9c9f7fe2cf
wording 2024-02-05 15:50:41 -04:00
Joey Hess
48fe8ba23c
forgot to add this comment earlier 2024-02-05 15:49:32 -04:00
Joey Hess
792106abc3
improve special remote docs
Sponsored-by: Dartmouth College's DANDI project
2024-02-05 15:48:15 -04:00
Joey Hess
083c471ee9
really close 2024-02-05 15:20:40 -04:00
Joey Hess
6b38d0c427
addurl, importfeed: Added --raw-except option
--raw-except=web allows using yt-dlp but not any other special remotes.

Currently this option can only be used once, trying to use it repeatedly
will make option parsing fail. Perhaps it ought to support being used more
than once, but it seemed like an unlikely use case to need that.

Note that getParsed is called repeatedly when the option is used with
several urls. While implementing DeferredParseClass would avoid that
innefficiency, it didn't seem worth the added boilerplate since
getParsed only calls byNameWithUUID which does minimal work.

Sponsored-by: Dartmouth College's DANDI project
2024-02-05 15:16:25 -04:00
Joey Hess
c0c85a7de4
comment and close 2024-02-05 14:11:47 -04:00
Joey Hess
d7419d6e65
comment 2024-02-05 14:06:03 -04:00
Joey Hess
e9ffa95fab
comment 2024-02-05 13:48:29 -04:00