Merge branch 'master'

Author: UUGTech

.github/workflows/brew.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Bump homebrew-core formula
-      uses: mislav/bump-homebrew-formula-action@v2
+      uses: mislav/bump-homebrew-formula-action@v3
       env:
         COMMITTER_TOKEN: ${{ secrets.BREW_TOKEN }}
       with:

.github/workflows/cd.yml

@@ -4,6 +4,7 @@ on:
   push:
    tags:
      - '*'
+  workflow_dispatch:
 
 jobs:
   release:
@@ -34,6 +35,8 @@ jobs:
 
     - name: Build
       if: matrix.os != 'ubuntu-22.04'
+      env:
+        GITUI_RELEASE: 1
       run: cargo build
     - name: Run tests
       if: matrix.os != 'ubuntu-22.04'
@@ -68,16 +71,24 @@ jobs:
 
     - name: Build Release Mac
       if: matrix.os == 'macos-latest'
-      run: GITUI_RELEASE=1 make release-mac
+      env:
+        GITUI_RELEASE: 1
+      run: make release-mac
     - name: Build Release Linux
       if: matrix.os == 'ubuntu-latest'
-      run: GITUI_RELEASE=1 make release-linux-musl
+      env:
+        GITUI_RELEASE: 1
+      run: make release-linux-musl
     - name: Build Release Win
       if: matrix.os == 'windows-latest'
-      run: GITUI_RELEASE=1 make release-win
+      env:
+        GITUI_RELEASE: 1
+      run: make release-win
     - name: Build Release Linux ARM
       if: matrix.os == 'ubuntu-22.04'
-      run: GITUI_RELEASE=1 make release-linux-arm
+      env:
+        GITUI_RELEASE: 1
+      run: make release-linux-arm
 
     - name: Set SHA
       if: matrix.os == 'macos-latest'
@@ -102,7 +113,7 @@ jobs:
           ./release/*.msi
 
     - name: Bump homebrew-core formula
-      uses: mislav/bump-homebrew-formula-action@v2
+      uses: mislav/bump-homebrew-formula-action@v3
       if: "matrix.os == 'macos-latest' && !contains(github.ref, '-')" # skip prereleases
       env:
         COMMITTER_TOKEN: ${{ secrets.BREW_TOKEN }}

CHANGELOG.md

@@ -7,22 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+* add sort_by popup to branchlist [[@UUGTech](https://github.com/UUGTech)]([#2146](https://github.com/extrawurst/gitui/issues/2146))
+
+## [0.26.0+1] - 2024-04-14
+
+**0.26.1** 
+this release has no changes to `0.26.0` but provides windows binaries that were missing before.
+
+**commit signing**
+
+![signing](assets/gitui-signing.png)
+
 ### Added
 * sign commits using openpgp [[@hendrikmaus](https://github.com/hendrikmaus)] ([#97](https://github.com/extrawurst/gitui/issues/97))
+* support ssh commit signing (when `user.signingKey` and `gpg.format = ssh` of gitconfig are set; ssh-agent isn't yet supported)  [[@yanganto](https://github.com/yanganto)] ([#1149](https://github.com/extrawurst/gitui/issues/1149))
 * provide nightly builds (see [NIGHTLIES.md](./NIGHTLIES.md)) ([#2083](https://github.com/extrawurst/gitui/issues/2083))
 * more version info in `gitui -V` and `help popup` (including git hash)
 * support `core.commitChar` filtering [[@concelare](https://github.com/concelare)] ([#2136](https://github.com/extrawurst/gitui/issues/2136))
 * allow reset in branch popup ([#2170](https://github.com/extrawurst/gitui/issues/2170))
-* support ssh commit signing (when `user.signingKey` and `gpg.format = ssh` of gitconfig are set; ssh-agent isn't yet supported)  [[@yanganto](https://github.com/yanganto)] ([#1149](https://github.com/extrawurst/gitui/issues/1149))
-* add sort_by popup to branchlist [[@UUGTech](https://github.com/UUGTech)]([#2146](https://github.com/extrawurst/gitui/issues/2146))
-* respect configuration for remote when pushing [[@cruessler](https://github.com/cruessler)]
+* respect configuration for remote when pushing [[@cruessler](https://github.com/cruessler)] ([#2156](https://github.com/extrawurst/gitui/issues/2156))
 
 ### Changed
 * Make info and error message popups scrollable [[@MichaelAug](https://github.com/MichaelAug)] ([#1138](https://github.com/extrawurst/gitui/issues/1138))
 * clarify `x86_64` linux binary in artifact names: `gitui-linux-x86_64.tar.gz` (formerly known as `musl`) ([#2148](https://github.com/extrawurst/gitui/issues/2148))
 
 ### Fixes
 * add syntax highlighting support for more file types, e.g. Typescript, TOML, etc. [[@martihomssoler](https://github.com/martihomssoler)] ([#2005](https://github.com/extrawurst/gitui/issues/2005))
+* windows release deployment was broken (reason for release `0.26.1`) [218d739](https://github.com/extrawurst/gitui/commit/218d739b035a034b7bf547629d24787909f467bf)
 
 ## [0.25.2] - 2024-03-22
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "gitui"
-version = "0.25.2"
+version = "0.26.1"
 authors = ["extrawurst <[email protected]>"]
 description = "blazing fast terminal-ui for git"
 edition = "2021"
@@ -16,7 +16,7 @@ build = "build.rs"
 
 [dependencies]
 anyhow = "1.0"
-asyncgit = { path = "./asyncgit", version = "0.25", default-features = false }
+asyncgit = { path = "./asyncgit", version = "0.26", default-features = false }
 backtrace = "0.3"
 bitflags = "2.5"
 bugreport = "0.5"

Cargo.toml

@@ -1,7 +1,7 @@
 <h1 align="center">
 <img width="300px" src="assets/logo.png" />
 
-[![CI][s0]][l0] [![crates][s1]][l1] ![MIT][s2] [![UNSAFE][s3]][l3] [![ITCH][s4]][l4] [![TWEET][s6]][l6] [![dep_status][s7]][l7]
+[![CI][s0]][l0] [![crates][s1]][l1] ![MIT][s2] [![UNSAFE][s3]][l3] [![TWEET][s6]][l6] [![dep_status][s7]][l7] [![discord][s8]][l8]
 
 </h1>
 
@@ -12,12 +12,12 @@
 [s2]: https://img.shields.io/badge/license-MIT-blue.svg
 [s3]: https://img.shields.io/badge/unsafe-forbidden-success.svg
 [l3]: https://github.com/rust-secure-code/safety-dance/
-[s4]: https://img.shields.io/badge/itch.io-ok-green
-[l4]: https://extrawurst.itch.io/gitui
 [s6]: https://img.shields.io/twitter/follow/extrawurst?label=follow&style=social
 [l6]: https://twitter.com/intent/follow?screen_name=extrawurst
 [s7]: https://deps.rs/repo/github/extrawurst/gitui/status.svg
 [l7]: https://deps.rs/repo/github/extrawurst/gitui
+[s8]: https://img.shields.io/discord/1176858176897953872
+[l8]: https://discord.gg/rQNeEnMhus
 
 <h5 align="center">GitUI provides you with the comfort of a git GUI but right in your terminal</h1>
 

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "asyncgit"
-version = "0.25.1"
+version = "0.26.0"
 authors = ["extrawurst <[email protected]>"]
 edition = "2021"
 description = "allow using git2 in a asynchronous context"
@@ -29,7 +29,7 @@ rayon = "1.10"
 rayon-core = "1.12"
 scopetime = { path = "../scopetime", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
-ssh-key = { version = "0.6.4", features = ["crypto", "encryption"] }
+ssh-key = { version = "0.6.6", features = ["crypto", "encryption"] }
 thiserror = "1.0"
 unicode-truncate = "0.2"
 url = "2.5"