Skip to content

Commit c4e6849

Browse files
committed
Merge branch 'main' into write-sparse-index
Conflicts: git-index/tests/index/file/read.rs
2 parents e41ad0f + 9fab050 commit c4e6849

File tree

128 files changed

+3791
-1391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+3791
-1391
lines changed

Diff for: .github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
- name: Setup dependencies
3939
run:
4040
sudo apt-get install tree
41-
- run: git config --global protocol.file.allow always # workaround for https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586
4241
- name: test
4342
env:
4443
CI: true

Diff for: Cargo.lock

+53-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ git-repository = { version = "^0.25.0", path = "git-repository", default-feature
8686
git-transport-for-configuration-only = { package = "git-transport", optional = true, version = "^0.21.0", path = "git-transport" }
8787

8888
clap = { version = "3.2.5", features = ["derive", "cargo"] }
89-
prodash = { version = "20.2.0", optional = true, default-features = false }
89+
prodash = { version = "21", optional = true, default-features = false }
9090
atty = { version = "0.2.14", optional = true, default-features = false }
9191
env_logger = { version = "0.9.0", default-features = false }
9292
crosstermion = { version = "0.10.1", optional = true, default-features = false }

Diff for: DEVELOPMENT.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ A bunch of notes collected to keep track of what's needed to eventually support
125125

126126
## `Options` vs `Context`
127127

128-
- Use `Options` whenever there is something to configure in terms of branching behaviour.
129-
- Use `Context` when potential optional data is required to perform an operation at all. See `git_config::path::Context` as reference.
128+
- 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.
129+
- 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
130+
fields could also be parameters.
130131

131132
## Examples, Experiments, Porcelain CLI and Plumbing CLI - which does what?
132133

Diff for: README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Please see _'Development Status'_ for a listing of all crates and their capabili
5454
* [x] **ref-map** - show how remote references relate to their local tracking branches as mapped by refspecs.
5555
* [x] **fetch** - fetch the current remote or the given one, optionally just as dry-run.
5656
* **clone**
57-
* [ ] initialize a new **bare** repository and fetch all objects.
58-
* [ ] initialize a new repository, fetch all objects and checkout the main worktree.
57+
* [x] initialize a new **bare** repository and fetch all objects.
58+
* [x] initialize a new repository, fetch all objects and checkout the main worktree.
5959
* **credential**
6060
* [x] **fill/approve/reject** - The same as `git credential`, but implemented in Rust, calling helpers only when from trusted configuration.
6161
* **free** - no git repository necessary
@@ -313,11 +313,13 @@ For additional details, also take a look at the [collaboration guide].
313313
Provide a CLI to for the most basic user journey:
314314

315315
* [x] initialize a repository
316+
* [x] fetch
317+
* [ ] and update worktree
316318
* clone a repository
317319
- [ ] bare
318320
- [ ] with working tree
319-
* [ ] create a commit
320-
* [ ] add a remote
321+
* [ ] create a commit after adding worktree files
322+
* [x] add a remote
321323
* [ ] push
322324
* [x] create (thin) pack
323325

0 commit comments

Comments
 (0)