Joey Hess
1291a7d86c
Merge branch 'master' into readonly-annex-merge
2021-12-28 13:03:27 -04:00
Joey Hess
91317dd2bb
Merge branch 'master' of ssh://git-annex.branchable.com
2021-12-27 15:46:01 -04:00
Joey Hess
4257c23370
update on status
2021-12-27 15:45:22 -04:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
fe26c9aa60
Added a comment
2021-12-27 18:51:14 +00:00
Joey Hess
7f6b2ca49c
handle overBranchFileContents with read-only unmerged git-annex branches
...
This makes --all error out in that situation. Which is better than
ignoring information from the branches.
To really handle the branches right, overBranchFileContents would need
to both query all the branches and union merge file contents
(or perhaps not provide any file content), as well as diffing between
branches to find files that are only present in the unmerged branches.
And also, it would need to handle transitions..
Sponsored-by: Dartmouth College's Datalad project
2021-12-27 14:30:51 -04:00
Joey Hess
0c208e2cdb
comment
2021-12-27 13:44:49 -04:00
Joey Hess
ba3d89935b
status
2021-12-27 13:21:09 -04:00
Joey Hess
da6aa6e944
retitle
2021-12-26 12:33:34 -04:00
Joey Hess
575cd71ce4
comment
2021-12-26 12:31:17 -04:00
Joey Hess
5ff55f622d
improve sync message in export edge case
...
sync: Better error message when unable to export to a remote because
remote.name.annex-tracking-branch is configured to a ref that does not
exist.
It does not suggest how to fix the problem because there are several
possible solutions: Change the git config to point to something that does
exist, git add some files, or put files on the special remote that will be
imported and so populate the ref.
I considered just silently not doing anything, which is what it does
when annex-tracking-branch = master and nothing has been committed to
master yet. But it seems better to be explicit about it, since this is a
fairly confusing situation to find yourself in.
Sponsored-By: Max Thoursie on Patreon
2021-12-23 14:45:01 -04:00
Joey Hess
1ca73107a3
comment
2021-12-23 14:03:04 -04:00
Joey Hess
6600cd2df3
response
2021-12-22 13:02:12 -04:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
139683a56d
2021-12-19 16:30:18 +00:00
jenkin.schibel@286264d9ceb79998aecff0d5d1a4ffe34f8b8421
aad516ee42
2021-12-17 17:45:38 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
9e402d21a3
Added a comment
2021-12-16 23:41:56 +00:00
manishofyore@b68d21cd485417e84ea87876a9064f82714a08a1
5098f970e2
Added a comment
2021-12-16 19:35:03 +00:00
Joey Hess
f566658b31
comment
2021-12-16 15:24:59 -04:00
manishofyore@b68d21cd485417e84ea87876a9064f82714a08a1
3ab86307bb
Added a comment
2021-12-16 18:53:15 +00:00
Joey Hess
1d4e1c2f6d
comment
2021-12-16 10:54:49 -04:00
Joey Hess
8b3238cf42
Merge branch 'master' of ssh://git-annex.branchable.com
2021-12-14 13:27:11 -04:00
manishofyore@b68d21cd485417e84ea87876a9064f82714a08a1
0ba973463f
Added a comment
2021-12-13 23:12:53 +00:00
Joey Hess
fe31951e5e
close
2021-12-13 13:13:54 -04:00
Joey Hess
22e805b9f2
clarify
2021-12-13 12:48:45 -04:00
Joey Hess
ca99d43a2a
comment
2021-12-13 12:47:52 -04:00
Joey Hess
50cfc4e71f
comment
2021-12-13 12:46:47 -04:00
Joey Hess
3e199a558d
comment
2021-12-13 12:38:27 -04:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
14823f485d
Added a comment
2021-12-12 02:49:28 +00:00
tomdhunt
bed2c784ae
2021-12-10 19:26:28 +00:00
tomdhunt
d64feaae26
2021-12-10 19:07:46 +00:00
yarikoptic
74f8ba7813
Added a comment
2021-12-09 21:45:29 +00:00
io42630
9b3984d5e3
rename forum/__91__Question__93___Mixing_.thin_and_.fat_repos__63__.mdwn to forum/__91__Question__93___Mixing_.thin_and_default_repos__63__.mdwn
2021-12-09 21:05:46 +00:00
io42630
cb75782431
2021-12-09 21:02:28 +00:00
io42630
ff189fe837
2021-12-09 21:01:05 +00:00
Joey Hess
b1ad888a9f
moreinfo, sigh
2021-12-09 15:43:14 -04:00
yarikoptic
3899ff3cf1
Added a comment
2021-12-09 19:10:57 +00:00
Joey Hess
262400fe04
comment
2021-12-09 15:07:34 -04:00
Joey Hess
130427fa09
comment
2021-12-09 15:01:54 -04:00
Joey Hess
3d7b5f442a
comment
2021-12-09 14:59:36 -04:00
Joey Hess
b69f354a87
comment
2021-12-09 14:43:10 -04:00
Joey Hess
dbba231e06
Improve error message display when autoinit fails
...
Due to eg, a permissions problem.
2021-12-09 14:38:12 -04:00
Joey Hess
ab3c13c021
comment
2021-12-09 13:57:25 -04:00
Joey Hess
975ddae967
comment
2021-12-09 13:51:03 -04:00
Joey Hess
61b48b69ba
fix build on windows
2021-12-09 13:39:16 -04:00
yarikoptic
68e8ed5acb
add more lines for more informative extract
2021-12-09 16:32:03 +00:00
yarikoptic
918b28b6dc
Initial report details from Manish on Windows
2021-12-09 16:30:44 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
f1516579ce
Added a comment
2021-12-09 16:20:48 +00:00
jwodder
4b0af2f27b
2021-12-09 14:13:54 +00:00
alt
7eef6ac703
Added a comment
2021-12-08 20:01:33 +00:00
Joey Hess
4a1758fccf
Merge branch 'master' of ssh://git-annex.branchable.com
2021-12-08 15:38:23 -04:00
Joey Hess
b865ae6b38
comment
2021-12-08 15:20:36 -04:00
