Commit graph

11544 commits

Author SHA1 Message Date
dukeofcool199
3a3e17cee5 2022-09-24 19:21:09 +00:00
Joey Hess
2478e9e03a
restage: New git-annex command, handles restaging unlocked files
This is much easier and less failure-prone than having the user run
git update-index --refresh themselves.

Sponsored-by: Dartmouth College's DANDI project
2022-09-23 16:29:59 -04:00
Joey Hess
d049228fd3
comment and todo 2022-09-22 14:48:32 -04:00
Joey Hess
0139a732fe
Merge branch 'master' of ssh://git-annex.branchable.com 2022-09-22 14:40:29 -04:00
Joey Hess
6e3c9bea2e
drain transferrer read handle when shutting it down
Fixes updating git index file after getting an unlocked file when
annex.stalldetection is set.

The transferrer may want to send additional protocol messages when it's
shut down. Closing the read handle prevented it from doing that, and caused
it to crash rather than cleanly shutting down.

Draining the handle without processing the protocol seemed ok to do,
because anything it outputs is going to be some side message displayed
at shutdown. Displaying those once per transferrer process that is running
seems unncessary.

Sponsored-by: Dartmouth College's DANDI project
2022-09-22 14:39:39 -04:00
yarikoptic
ea4a466b8b Added a comment 2022-09-22 18:14:15 +00:00
Joey Hess
f015f3e8e3
comment 2022-09-22 14:03:31 -04:00
Joey Hess
5ed774b701
comment 2022-09-22 13:40:13 -04:00
Joey Hess
72cdbd01f4
Merge branch 'master' of ssh://git-annex.branchable.com 2022-09-22 13:37:26 -04:00
Joey Hess
368ad64160
correct my comment 2022-09-22 13:37:01 -04:00
yarikoptic
2415c8f8b9 Added a comment 2022-09-22 17:34:35 +00:00
Joey Hess
3f2bbae4cb
reproduced this now 2022-09-22 13:25:02 -04:00
jgoerzen
63f8b78e29 Added a comment 2022-09-22 03:40:04 +00:00
yarikoptic
79fa55ce88 Added a comment 2022-09-22 01:33:24 +00:00
yarikoptic
f75641f9f6 Added a comment 2022-09-22 01:03:18 +00:00
Joey Hess
6f0566d704
comment 2022-09-21 18:17:21 -04:00
Joey Hess
2731e3ab38
wording 2022-09-21 16:13:08 -04:00
Joey Hess
05592a2ddb
comment 2022-09-21 16:11:10 -04:00
yarikoptic
ad31c9fc19 Added a comment 2022-09-21 18:49:07 +00:00
yarikoptic
65cd69217c Added a comment 2022-09-21 18:46:50 +00:00
Joey Hess
2f16ff8cdc
comment 2022-09-21 13:17:21 -04:00
yarikoptic
f967316f31 initial report on odd "modified" status 2022-09-20 22:22:42 +00:00
Joey Hess
8d26fdd670
skip checkRepoConfigInaccessible when git directory specified explicitly
Fix a reversion that prevented git-annex from working in a repository when
--git-dir or GIT_DIR is specified to relocate the git directory to
somewhere else. (Introduced in version 10.20220525)

checkRepoConfigInaccessible could still run git config --list, just passing
--git-dir. It seems not necessary, because I know that passing --git-dir
bypasses git's check for repo ownership. I suppose it might be that git
eventually changes to check something about the ownership of the working
tree, so passing --git-dir without --work-tree would still be worth doing.
But for now this is the simple fix.

Sponsored-by: Nicholas Golder-Manning on Patreon
2022-09-20 14:52:43 -04:00
Joey Hess
d1467a9b8e
bug report rescued from forum 2022-09-20 14:16:15 -04:00
Joey Hess
8479ac6a50
fixed 2022-09-20 13:35:47 -04:00
Joey Hess
3adf1f24e2
comment 2022-09-20 12:56:16 -04:00
Joey Hess
612d2a8056
comment 2022-09-20 12:39:40 -04:00
jgoerzen
d3408ec63d Added a comment 2022-09-19 13:55:07 +00:00
Joey Hess
1fe9cf7043
deal with ignoreinode config setting
Improve handling of directory special remotes with importtree=yes whose
ignoreinode setting has been changed. (By either enableremote or by
upgrading to commit 3e2f1f73cbc5fc10475745b3c3133267bd1850a7.)

When getting a file from such a remote, accept the content that would have
been accepted with the previous ignoreinode setting.

After a change to ignoreinode, importing a tree from the remote will
re-import and generate new content identifiers using the new config. So
when ignoreinode has changed to no, the inodes will be learned, and after
that point, a change in an inode will be detected as a change. Before
re-importing, a change in an inode will be ignored, as it was before the
ignoreinode change. This seems acceptble, because the user can re-import
immediately if they urgently need to add inodes. And if not, they'll
do it sometime, presumably, and the change will take effect then.

Sponsored-by: Erik Bjäreholt on Patreon
2022-09-16 14:11:25 -04:00
Joey Hess
4a1030d51d
comments 2022-09-16 13:40:27 -04:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
50cdf369b9 closing 2022-09-13 23:32:49 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
d21bac4d88 Added a comment 2022-09-13 23:32:01 +00:00
Joey Hess
97825216b2
Merge branch 'master' of ssh://git-annex.branchable.com 2022-09-13 14:13:31 -04:00
Joey Hess
d722681a10
comment 2022-09-13 14:13:19 -04:00
yarikoptic
57543f11a8 Added a comment 2022-09-13 18:02:35 +00:00
Joey Hess
ea6c733e45
comment 2022-09-13 13:19:18 -04:00
Joey Hess
0648b6337b
comment 2022-09-13 12:49:49 -04:00
jgoerzen
e92dfbce72 Added a comment 2022-09-10 00:38:17 +00:00
jgoerzen
0d265841d4 Added a comment 2022-09-10 00:37:45 +00:00
jgoerzen
29a80ceed1 2022-09-10 00:37:09 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
cc053c820e Added a comment 2022-09-09 20:46:31 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
a2dd58e9d4 Added a comment 2022-09-09 20:45:13 +00:00
Joey Hess
d2c842e9a1
don't force use of conduit in withUrlOptionsPromptingCreds
Use curl for downloads from git remotes when annex.url-options and other
git configs are set.

If the url needs a password, curl will fail, and git credential will not be
used to prompt for it. But the user can set --netrc in url-options and
put the password in the netrc file.

This also means that url-options settings like -4 will take effect.
That was the case before commit 1883f7ef8f
forced conduit to be used.
2022-09-09 16:07:32 -04:00
Joey Hess
511e711bed
close 2022-09-09 14:53:26 -04:00
yarikoptic
22a311ef46 reporting flaky tests on ndoli 2022-09-08 15:01:50 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
2c4c56ea50 Added a comment: git-credential-netrc 2022-09-08 02:02:40 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
4f3a33d824 2022-09-08 01:10:06 +00:00
nick.guenther@e418ed3c763dff37995c2ed5da4232a7c6cee0a9
d8c98399e1 Added a comment 2022-09-08 00:28:32 +00:00
jgoerzen
aa4ba3fc7c Added a comment 2022-09-05 22:01:24 +00:00
jgoerzen
403dca7c42 Added a comment 2022-09-05 18:44:01 +00:00