Merge branch 'main' into write-sparse-index

Conflicts:
	git-index/tests/index/file/read.rs

.github/workflows/ci.yml

@@ -38,7 +38,6 @@ jobs:
     - name: Setup dependencies
       run:
         sudo apt-get install tree
-    - run: git config --global protocol.file.allow always # workaround for https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586
     - name: test
       env:
         CI: true

Cargo.toml

@@ -86,7 +86,7 @@ git-repository = { version = "^0.25.0", path = "git-repository", default-feature
 git-transport-for-configuration-only = { package = "git-transport", optional = true, version = "^0.21.0", path = "git-transport" }
 
 clap = { version = "3.2.5", features = ["derive", "cargo"] }
-prodash = { version = "20.2.0", optional = true, default-features = false }
+prodash = { version = "21", optional = true, default-features = false }
 atty = { version = "0.2.14", optional = true, default-features = false }
 env_logger = { version = "0.9.0", default-features = false }
 crosstermion = { version = "0.10.1", optional = true, default-features = false }

DEVELOPMENT.md

@@ -125,8 +125,9 @@ A bunch of notes collected to keep track of what's needed to eventually support
 
 ## `Options` vs `Context`
 
-- Use `Options` whenever there is something to configure in terms of branching behaviour.
-- Use `Context` when potential optional data is required to perform an operation at all. See `git_config::path::Context` as reference.
+- Use `Options` whenever there is something to configure in terms of branching behaviour. It can be defaulted, and if it can't these fields should be parameters.
+- Use `Context` when potential optional data is required to perform an operation at all. See `git_config::path::Context` as reference. It can't be defaulted and the
+  fields could also be parameters.
 
 ## Examples, Experiments, Porcelain CLI and Plumbing CLI - which does what?
 

README.md

@@ -54,8 +54,8 @@ Please see _'Development Status'_ for a listing of all crates and their capabili
         * [x] **ref-map** - show how remote references relate to their local tracking branches as mapped by refspecs.
     * [x] **fetch** - fetch the current remote or the given one, optionally just as dry-run.
     * **clone**
-        * [ ] initialize a new **bare** repository and fetch all objects.
-        * [ ] initialize a new repository, fetch all objects and checkout the main worktree.
+        * [x] initialize a new **bare** repository and fetch all objects.
+        * [x] initialize a new repository, fetch all objects and checkout the main worktree.
     * **credential**
         * [x] **fill/approve/reject** - The same as `git credential`, but implemented in Rust, calling helpers only when from trusted configuration.
     * **free** - no git repository necessary
@@ -313,11 +313,13 @@ For additional details, also take a look at the [collaboration guide].
 Provide a CLI to for the most basic user journey:
 
 * [x] initialize a repository
+* [x] fetch
+    * [ ] and update worktree
 * clone a repository
    - [ ] bare
    - [ ] with working tree
-* [ ] create a commit
-* [ ] add a remote
+* [ ] create a commit after adding worktree files
+* [x] add a remote
 * [ ] push
   * [x] create (thin) pack