From 924e5af6b92556dc23d9aed0b595dd2cf6191dda Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Jul 2019 11:44:57 -0400 Subject: [PATCH] change a few last v6 references to v7 Since v6 is not a usable repo version any longer, it's confusing to have documentation that refers to it. This commit was sponsored by Peter on Patreon. --- doc/git-annex-adjust.mdwn | 2 +- doc/git-annex-direct.mdwn | 2 +- doc/git-annex-indirect.mdwn | 2 +- .../Accessing_files_in_bare_remotes_without_git-annex.mdwn | 2 +- doc/tips/largefiles.mdwn | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/git-annex-adjust.mdwn b/doc/git-annex-adjust.mdwn index 993fb984ac..027d14a4fc 100644 --- a/doc/git-annex-adjust.mdwn +++ b/doc/git-annex-adjust.mdwn @@ -29,7 +29,7 @@ while inside the adjusted branch will update the adjusted branch as necessary (eg for `--hide-missing`), and will also propagate commits back to the original branch. -This command can only be used in a v6 git-annex repository. +This command can only be used in a v7 git-annex repository. # OPTIONS diff --git a/doc/git-annex-direct.mdwn b/doc/git-annex-direct.mdwn index c3d7dfadc2..5e9a41a16b 100644 --- a/doc/git-annex-direct.mdwn +++ b/doc/git-annex-direct.mdwn @@ -17,7 +17,7 @@ Note that git commands that operate on the work tree will refuse to run in direct mode repositories. Use `git annex proxy` to safely run such commands. -Note that the direct mode/indirect mode distinction is removed in v6 +Note that the direct mode/indirect mode distinction is removed in v7 git-annex repositories. In such a repository, you can use [[git-annex-unlock]](1) to make a file's content be directly present. You can also use [[git-annex-adjust]](1) to enter a branch where all diff --git a/doc/git-annex-indirect.mdwn b/doc/git-annex-indirect.mdwn index 321e0fb369..c2bd4c5dbc 100644 --- a/doc/git-annex-indirect.mdwn +++ b/doc/git-annex-indirect.mdwn @@ -11,7 +11,7 @@ git annex indirect Switches a repository back from direct mode to the default, indirect mode. -Note that the direct mode/indirect mode distinction is removed in v6 +Note that the direct mode/indirect mode distinction is removed in v7 git-annex repositories. # SEE ALSO diff --git a/doc/tips/Accessing_files_in_bare_remotes_without_git-annex.mdwn b/doc/tips/Accessing_files_in_bare_remotes_without_git-annex.mdwn index c9af79cdfd..a1322e1546 100644 --- a/doc/tips/Accessing_files_in_bare_remotes_without_git-annex.mdwn +++ b/doc/tips/Accessing_files_in_bare_remotes_without_git-annex.mdwn @@ -1,7 +1,7 @@ git-annex is amazing for my large files backup necessities, but I am a bit scared for the long-term possibility of accessing data, without git-annex. -For this reason I have prepared a small Python tool that accesses the content of bare git-annex repositories. The tool retrieves the locations of a file, and the path to the file in the current annex. This works with the last v6 version of the git-annex format. +For this reason I have prepared a small Python tool that accesses the content of bare git-annex repositories. The tool retrieves the locations of a file, and the path to the file in the current annex. This works with the last v7 version of the git-annex format. This is motivated by the fact that in the master branch the files are stores as links to .git/annex/objects/XX/YY/KEY/KEY (as it is correct for non-bare repos), while in the bare the files are stored in annex/objecst/ZZ/WW/KEY/KEY. diff --git a/doc/tips/largefiles.mdwn b/doc/tips/largefiles.mdwn index e50ecf2df2..f7f87611a9 100644 --- a/doc/tips/largefiles.mdwn +++ b/doc/tips/largefiles.mdwn @@ -1,7 +1,7 @@ [[!meta title="annex.largefiles: configuring mixed content repositories"]] Normally commands like `git annex add` always add files to the annex. -And when using the v6 repository mode, even `git add` and `git commit -a` +And when using the v7 repository mode, even `git add` and `git commit -a` will add files to the annex. Let's suppose you're developing a video game, written in C. You have @@ -12,7 +12,7 @@ possibly enormous files, but still version control them. The annex.largefiles configuration is useful for such mixed content repositories. It's checked by `git annex add`, by `git add` and `git commit -a` -(in v6 repositories), by `git annex import` and the assistant. It's +(in v7 repositories), by `git annex import` and the assistant. It's also used by `git annex addurl` and `git annex importfeed` when downloading files. When a file does not match annex.largefiles, these commands will add its content to git instead of to the annex.