Commit graph

36661 commits

Author SHA1 Message Date
Joey Hess
a568302460
response 2020-02-20 16:26:52 -04:00
Joey Hess
30423f2b2d
response 2020-02-20 16:21:34 -04:00
Joey Hess
7f96801642
improve 2020-02-20 16:01:38 -04:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
dc944876b5 Added a comment 2020-02-20 19:34:25 +00:00
Joey Hess
cc1958f416
response 2020-02-20 15:31:42 -04:00
Ilya_Shlyakhter
d521220e0e Added a comment: backends vs special remotes 2020-02-20 19:23:07 +00:00
Joey Hess
48fc8b7c4e
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-20 14:50:46 -04:00
Joey Hess
f2a925a3f5
comment 2020-02-20 14:45:12 -04:00
Joey Hess
3d00a8a1dc
Makefile: Support newer versions of cabal that use the new-build system.
Unfortunately, cabal puts the binary in a very complicated path
and does not provide any good way to get it out, leaving no good choice
except to use find.

It may be possible to use cabal (new-)install --symlink-bindir,
and ask it to symlink to pwd, but with my older version of cabal,
that does not work.

The stack branch will probably also break once it uses a newer cabal,
didn't try to deal with that.
2020-02-20 14:13:21 -04:00
Joey Hess
17b3c66a61
followup and merge 2020-02-20 13:35:37 -04:00
Joey Hess
be2a9e12bb
close 2020-02-20 13:22:37 -04:00
Joey Hess
0f9bf2d434
comments 2020-02-20 12:40:34 -04:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
3df2c2786c Added a comment: Backend which doesn't stoee files at all? 2020-02-20 14:52:25 +00:00
Ilya_Shlyakhter
55b0300b4c Added a comment 2020-02-20 03:50:53 +00:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
d71d7ac2f5 Added a comment 2020-02-20 02:02:06 +00:00
Ilya_Shlyakhter
027b3d1f71 Added a comment 2020-02-20 01:09:56 +00:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
3ed667980a 2020-02-20 00:06:21 +00:00
Ilya_Shlyakhter
a6b9092467 added forum item re: auto-fetching annexed files on open() 2020-02-19 21:11:06 +00:00
Joey Hess
79a9475007
devblog 2020-02-19 15:16:24 -04:00
Joey Hess
f2ccd6c772
remove instructions for v0 upgrade 2020-02-19 15:10:58 -04:00
Joey Hess
c1bfe86f6a
mention speedup 2020-02-19 15:09:00 -04:00
Joey Hess
0f3ecbe7e8
tighten up description of v8 upgrade 2020-02-19 15:07:48 -04:00
Joey Hess
de144d3867
clean up 2020-02-19 15:04:31 -04:00
Joey Hess
560e9eb8da
remove obsolete comments
more complaining about git add behavior change, will I ever find the end
of it?
2020-02-19 15:02:09 -04:00
Joey Hess
3407af4112
remove tips for v2 and v3 upgrade
Chances any v1 or v2 repos still exist is approximately 0.
2020-02-19 14:59:20 -04:00
Joey Hess
843f024469
fix formatting 2020-02-19 14:56:02 -04:00
Joey Hess
04258f759a
this page is not a bts 2020-02-19 14:52:10 -04:00
Joey Hess
76dc30c168
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-19 14:48:38 -04:00
Ilya_Shlyakhter
8957006c06 Added a comment: preventing fetching from special remotes 2020-02-19 18:45:10 +00:00
Joey Hess
d431dba1a8
merged v8 into master 2020-02-19 14:37:56 -04:00
Joey Hess
029c883713
Merge branch 'master' into v8 2020-02-19 14:32:11 -04:00
Joey Hess
a22ed03d0f
tighten up docs of dotfiles changes 2020-02-19 14:29:50 -04:00
Joey Hess
79a0435b77
automate remote.name.skipFetchAll
initremote, enableremote: Set remote.name.skipFetchAll when the remote
cannot be fetched from by git, so git fetch --all will not try to use it.
2020-02-19 13:58:26 -04:00
Joey Hess
69f2d1dd43
remoteConfig rework
remoteAnnexConfig will avoid bugs like
a3a674d15b

Use now more generic remoteConfig in a couple places that built
non-annex config settings manually before.
2020-02-19 13:45:11 -04:00
Joey Hess
a3a674d15b
Bugfix: export --tracking (a deprecated option) set annex-annex-tracking-branch, instead of annex-tracking-branch. 2020-02-19 13:34:24 -04:00
Joey Hess
1f0fc9ff5f
remove unused import 2020-02-19 13:13:13 -04:00
Joey Hess
d35e2da5cb
clean up some very confusing language about non-special remotes 2020-02-19 13:01:20 -04:00
Joey Hess
e02b3b32f1
comment 2020-02-19 13:01:15 -04:00
Joey Hess
30f0858c71
clean up 2020-02-19 12:47:52 -04:00
Joey Hess
4ee7067e8e
add news item for git-annex 7.20200219 2020-02-19 12:46:25 -04:00
Joey Hess
cd8a208b8c
releasing package git-annex version 7.20200219 2020-02-19 12:45:30 -04:00
Joey Hess
a5ce518e7d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-19 12:38:37 -04:00
Joey Hess
72959b23e5
remove mention of receive.denyNonFastforwards on push failure
That was added back in 2013 commit 2af652e1b8
and I'm a bit unclear about the reasons.

It seemed that, at the time, receive.denyNonFastforwards=true, which is
the default in a repo created by git init --shared --bare (but not
without --shared), which the assistant did, caused problems syncing.
But even at the time the bug report showed an error message clearly
explaining that it was a non-fast-forward push being denied.

I tried it with the current version, and since git-annex sync pulls
from the bare repo and merges, it pushes a fast-forward. So there's no
failure to push. (There could be one if another push happened after the
pull, but you'd want it to fail then presumably.)

I'm not 100% sure what changed to make it not be a problem, but I know
I've seen this message in many circumstances and I can't ever recall it
having anything to do with any issue that prevented a push.

Based on doc/forum/non_fast_forward_error_with_git_annex_sync.mdwn,
which showed the problem when syncing from a direct mode repo,
and on doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_3_0246fff6c7c75f6be45bd257ec3872a5._comment
which seems to show the problem was actually a problem pulling,
I think there's a good chance that the problem actually involved direct
mode.
2020-02-19 11:46:24 -04:00
Dan
ad6cc2178a Added a comment: Avoid fetching from special remotes 2020-02-19 00:22:06 +00:00
Ilya_Shlyakhter
0ae1a3335e Added a comment: thanks 2020-02-18 20:00:17 +00:00
Ilya_Shlyakhter
af91e5e5e7 Added a comment: git-annex build-time dependencies 2020-02-18 19:33:35 +00:00
Joey Hess
c4a1b04e8b
comment 2020-02-18 12:51:59 -04:00
Joey Hess
f1a1669224
clarify description of synced/ branches 2020-02-18 12:42:44 -04:00
Joey Hess
06f6eb7a70
--only-annex --no-content combination 2020-02-18 12:29:31 -04:00
Nick_P
cc4521068c Added a comment 2020-02-18 10:17:29 +00:00