Merge pull request #13 from epage/update

chore: Update dependencies

Author: epage

.clippy.toml

@@ -1 +1 @@
-msrv = "1.54.0"  # MSRV
+msrv = "1.60.0"  # MSRV

.github/workflows/audit.yml

@@ -1,4 +1,8 @@
 name: Security audit
+
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:
@@ -10,12 +14,18 @@ on:
       - '**/Cargo.lock'
   schedule:
   - cron: '1 1 1 * *'
+
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - uses: actions-rs/audit-check@v1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -1,4 +1,8 @@
 name: CI
+
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:
@@ -9,15 +13,16 @@ on:
   push:
     branches:
     - main
-    paths:
-    - '**'
-    - '!/*.md'
-    - '!/docs/**'
-    - "!/LICENSE-*"
-  schedule:
-  - cron: '1 1 1 * *'
+
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   ci:
+    permissions:
+      contents: none
     name: CI
     needs: [test, msrv, docs, rustfmt, clippy]
     runs-on: ubuntu-latest
@@ -34,7 +39,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -55,15 +60,15 @@ jobs:
     - name: No-default features
       run: cargo test --workspace --no-default-features
   msrv:
-    name: "Check MSRV: 1.54.0"
+    name: "Check MSRV: 1.60.0"
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.54.0  # MSRV
+        toolchain: 1.60.0  # MSRV
         profile: minimal
         override: true
     - uses: Swatinem/rust-cache@v1
@@ -78,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -95,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -113,11 +118,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.54.0  # MSRV
+        toolchain: 1.60.0  # MSRV
         profile: minimal
         override: true
         components: clippy

.github/workflows/committed.yml

@@ -3,13 +3,21 @@
 name: Lint Commits
 on: [pull_request]
 
+permissions:
+  contents: read
+
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   committed:
     name: Lint Commits
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Actions Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Lint Commits

.github/workflows/pre-commit.yml

@@ -1,12 +1,22 @@
 name: pre-commit
+
+permissions:
+  contents: read
+
 on:
   pull_request:
   push:
     branches: [main]
+
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.3
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/action@v3.0.0

.github/workflows/rust-next.yml

@@ -1,7 +1,17 @@
 name: rust-next
+
+permissions:
+  contents: read
+
 on:
   schedule:
   - cron: '1 1 1 * *'
+
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   test:
     name: Test
@@ -16,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -45,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -61,13 +71,13 @@ jobs:
     strategy:
       matrix:
         rust:
-        - 1.54.0  # MSRV
+        - 1.60.0  # MSRV
         - stable
-    continue-on-error: ${{ matrix.rust != '1.54.0' }}  # MSRV
+    continue-on-error: ${{ matrix.rust != '1.60.0' }}  # MSRV
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:

.github/workflows/spelling.yml

@@ -1,12 +1,21 @@
 name: Spelling
+
+permissions:
+  contents: read
+
 on: [pull_request]
 
+env:
+  RUST_BACKTRACE: 1
+  CARGO_TERM_COLOR: always
+  CLICOLOR: 1
+
 jobs:
   spelling:
     name: Spell Check with Typos
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Actions Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Spell Check Repo
       uses: crate-ci/typos@master

Cargo.toml

@@ -9,7 +9,8 @@ documentation = "http://docs.rs/git2-ext/"
 readme = "README.md"
 categories = ["command-line-interface"]
 keywords = ["git"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.60.0"  # MSRV
 include = [
   "build.rs",
   "src/**/*",
@@ -36,5 +37,5 @@ itertools = "0.10"
 which = "4"
 
 [dev-dependencies]
-git-fixture = { version = "0.2" }
+git-fixture = { version = "0.3", features = ["yaml"] }
 assert_fs = "1"

tests/fixtures/branches.yml

@@ -1,56 +1,61 @@
 init: true
-events:
+commands:
 - tree:
-    tracked:
+    files:
       "file_a.txt": "1"
     message: "1"
-    branch: initial
+- branch: initial
 - tree:
-    tracked:
+    files:
       "file_a.txt": "2"
     message: "2"
 - tree:
-    tracked:
+    files:
       "file_a.txt": "3"
     message: "3"
-    branch: base
-- children:
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "1"
-        message: "4"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "2"
-        message: "5"
-        branch: master
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_b.txt": "3"
-        message: "6"
-        branch: off_master
-  - - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "1"
-        message: "7"
-        branch: feature1
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "2"
-        message: "8"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "3"
-        message: "9"
-    - tree:
-        tracked:
-          "file_a.txt": "3"
-          "file_c.txt": "4"
-        message: "10"
-        branch: feature2
+- branch: base
+- label: base
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "1"
+    message: "4"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "2"
+    message: "5"
+- branch: master
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_b.txt": "3"
+    message: "6"
+- branch: off_master
+
+- reset: base
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "1"
+    message: "7"
+- branch: feature1
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "2"
+    message: "8"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "3"
+    message: "9"
+- tree:
+    files:
+      "file_a.txt": "3"
+      "file_c.txt": "4"
+    message: "10"
+- branch: feature2
+- head: