Correctly request force-pushing in a triangular workflow #3528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesCodacy will stop sending the deprecated coverage status from June 5th, 2024. Learn more Footnotes
|
Closed
stefanhaller
force-pushed
the
support-triangular-workflow
branch
from
45aa829
to
3073e53
Compare
jesseduffield
approved these changes
May 19, 2024
| @@ -20,8 +21,16 @@ func NewSessionStateLoader(c *helpers.HelperCommon, refsHelper *helpers.RefsHelp | |||
| } | |||
| } | |||
|
|
|||
| type Commit struct { | |||
| Hash string | |||
| // We create shims for all the model classes in order to get a more stable API | |||
There was a problem hiding this comment.
Great stuff. We should also update docs/Custom_Command_Keybindings.md which currently says
To see what fields are available on e.g. the
SelectedFile, see here
We should update this to just point to this file now
There was a problem hiding this comment.
This is a tricky one. In some cases the original model struct has documentation for its fields (e.g. models.Branch), which I didn't copy over to the shims. So pointing users to the shims gives them less information.
Or should I copy the comments over? Seemed so redundant.
There was a problem hiding this comment.
hmm, interesting. I say point the users to this file but don't copy the comments. Most fields are self-explanatory and the ones that aren't are likely not the ones the user needs
There was a problem hiding this comment.
OK, works for me. To make this easier for users, I decided to move the struct definitions to a separate file (7ab7fae), and to remove the "Shim" from the names again (416106a). Documentation is adapted here: 91132a7.
I noticed that the documentation already says that we don't guarantee backwards compatibility. Do we now, and should remove this sentence? Also, it says we are planning to expose a tighter API in the future; do we want to change anything about that sentence? Feel free to push a fixup if you want to tweak that documentation further.
There was a problem hiding this comment.
I suppose we now do support backwards compatibility so indeed we can lose that line. We can also remove the part about the tighter API: I have no plans for changing things anytime soon.
There was a problem hiding this comment.
OK, removed in 283cf3a.
Going to squash now, and then merge (will take a moment as the fixups conflict).
stefanhaller
force-pushed
the
support-triangular-workflow
branch
2 times, most recently
from
91132a7
to
283cf3a
Compare
This guards against accidentally renaming a model field and thereby breaking user's custom commands. With this change we'll get a build failure when we do that.
It is unexpected that a function called PushBranch also sets the upstream branch; also, we want to add a PushBranch function in the next commit that doesn't.
… workflow Our code doesn't realize that we need to prompt the user to force push, when the branch is up-to-date with its upstream but not with the branch that we're pushing to.
In preparation for adding AheadForPush/BehindForPush in the next commit.
In a triangular workflow the branch that you're pulling from is not the same as the one that you are pushing to. For example, some people find it useful to set the upstream branch to origin/master so that pulling effectively rebases onto master, and set the push.default git config to "current" so that "feature" pushes to origin/feature. Another example is a fork-based workflow where "feature" has upstream set to upstream/main, and the repo has remote.pushDefault set to "origin", so pushing on "feature" pushes to origin/feature. This commit adds new fields to models.Branch that store the ahead/behind information against the push branch; for the "normal" workflow where you pull and push from/to the upstream branch, AheadForPush/BehindForPush will be the same as AheadForPull/BehindForPull.
To determine whether we need to ask for force pushing, we need to query the push branch rather than the upstream branch, in case they are not the same.
stefanhaller
force-pushed
the
support-triangular-workflow
branch
from
283cf3a
to
c5cf1b2
Compare
renovate bot
added a commit
to scottames/dots
that referenced
this pull request
May 24, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [aquaproj/aqua-registry](https://togithub.com/aquaproj/aqua-registry) | minor | `v4.181.0` -> `v4.185.1` | | [bitnami-labs/sealed-secrets](https://togithub.com/bitnami-labs/sealed-secrets) | patch | `v0.26.2` -> `v0.26.3` | | [golangci/golangci-lint](https://togithub.com/golangci/golangci-lint) | patch | `v1.58.1` -> `v1.58.2` | | [gruntwork-io/terragrunt](https://togithub.com/gruntwork-io/terragrunt) | patch | `v0.58.6` -> `v0.58.9` | | [helm/helm](https://togithub.com/helm/helm) | patch | `v3.15.0` -> `v3.15.1` | | [jesseduffield/lazygit](https://togithub.com/jesseduffield/lazygit) | minor | `v0.41.0` -> `v0.42.0` | | [kubernetes-sigs/kustomize](https://togithub.com/kubernetes-sigs/kustomize) | patch | `v5.4.1` -> `v5.4.2` | | [simulot/immich-go](https://togithub.com/simulot/immich-go) | minor | `0.13.2` -> `0.14.1` | | [stern/stern](https://togithub.com/stern/stern) | minor | `v1.29.0` -> `v1.30.0` | | [weaveworks/eksctl](https://togithub.com/weaveworks/eksctl) | minor | `v0.177.0` -> `v0.179.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>aquaproj/aqua-registry (aquaproj/aqua-registry)</summary> ### [`v4.185.1`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.185.1) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.185.0...v4.185.1) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.185.1) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.185.1) | aquaproj/aqua-registry@v4.185.0...v4.185.1 #### Fix [#​23225](https://togithub.com/aquaproj/aqua-registry/issues/23225) Rename the package `fujiwara/aws-sdk-client-go` to `fujiwara/awslim` [@​ponkio-o](https://togithub.com/ponkio-o) - [fujiwara/awslim#16 - https://x.com/fujiwara/status/1793839566283264315 ### [`v4.185.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.185.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.184.0...v4.185.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.185.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.185.0) | aquaproj/aqua-registry@v4.184.0...v4.185.0 #### 🎉 New Packages [#​23170](https://togithub.com/aquaproj/aqua-registry/issues/23170) [leg100/pug](https://togithub.com/leg100/pug): Drive terraform at terminal velocity #### Other This is a update for aqua-registry's contributors. https://aquaproj.github.io/docs/products/aqua-registry/changelog#2024-05-24 [#​23171](https://togithub.com/aquaproj/aqua-registry/issues/23171) [#​23188](https://togithub.com/aquaproj/aqua-registry/issues/23188) [#​23191](https://togithub.com/aquaproj/aqua-registry/issues/23191) [#​23192](https://togithub.com/aquaproj/aqua-registry/issues/23192) The behaviour of `cmdx s`, `cmdx t`, and `cmdx new` were changed. `cmdx s` - `cmdx s` fails if `commit.gpgSign` isn't enabled - All commits must be signed. Please see [the document](https://togithub.com/suzuki-shunsuke/oss-contribution-guide/blob/main/docs/commit-signing.md) - `cmdx s` fails if files in `pkgs` are changed before scaffolding files - This validation prevents unrelated changes from being committed - `cmdx s` creates a feature branch `feat/<package name>` from the remote branch https://github.com/aquaproj/aqua-registry/tree/main before scaffolding code - This prevents old scripts from being executed as much as possible - **`cmdx s` commits scaffolded codes** - This enables us to distinguish scaffolded code and manual changes - **`cmdx s` doesn't connect to a container when test fails** - This is a change of `cmdx t`. `cmdx s` runs `cmdx t` internally `cmdx t` - **`cmdx t` doesn't connect to a container when test fails** - If you want to connect to the container, you can do it by `cmdx con <os> <arch>` command - In most cases you don't have to connect to a container, so we changed the behaviour `cmdx new` - `cmdx new` doesn't create a branch and a commit anymore - **If you change code manually, you have to commit it before running `cmdx new`** - `cmdx new` fails if files in `pkgs` or `registry.yaml` has changes - `cmdx new` fails if the current branch isn't `feat/<package name>` - **You can omit the argument `pkg`** - `cmdx new` gets the package name from the current branch name ### [`v4.184.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.184.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.183.0...v4.184.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.184.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.184.0) | aquaproj/aqua-registry@v4.183.0...v4.184.0 #### 🎉 New Packages [#​23068](https://togithub.com/aquaproj/aqua-registry/issues/23068) [fujiwara/aws-sdk-client-go](https://togithub.com/fujiwara/aws-sdk-client-go): A simplified alternative to the AWS CLI for limited use cases [@​ponkio-o](https://togithub.com/ponkio-o) #### Fix [#​23111](https://togithub.com/aquaproj/aqua-registry/issues/23111) handlename/ssmwrap: Follow up changes of ssmwrap v2.1.0 [#​23112](https://togithub.com/aquaproj/aqua-registry/issues/23112) xremap/xremap/hypr: xremap client for hypr was dropped [#​23113](https://togithub.com/aquaproj/aqua-registry/issues/23113) xremap/xremap/sway: xremap client for sway was dropped [xremap/xremap#479 ### [`v4.183.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.183.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.182.0...v4.183.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.183.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.183.0) | aquaproj/aqua-registry@v4.182.0...v4.183.0 #### 🎉 New Packages [#​23041](https://togithub.com/aquaproj/aqua-registry/issues/23041) [rustsec/rustsec/cargo-audit](https://togithub.com/rustsec/rustsec): Audit your dependencies for crates [@​sapphi-red](https://togithub.com/sapphi-red) #### Fix [#​23049](https://togithub.com/aquaproj/aqua-registry/issues/23049) sl1pm4t/k2tf: Follow up changes of k2tf v0.8.0 ### [`v4.182.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.182.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.181.0...v4.182.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.182.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.182.0) | aquaproj/aqua-registry@v4.181.0...v4.182.0 #### 🎉 New Packages [#​23033](https://togithub.com/aquaproj/aqua-registry/issues/23033) [Ph0enixKM/Amber](https://togithub.com/Ph0enixKM/Amber): Amber the programming language compiled to bash [#​23032](https://togithub.com/aquaproj/aqua-registry/issues/23032) [firebase/firebase-tools](https://togithub.com/firebase/firebase-tools): The Firebase Command Line Tools [@​ka2n](https://togithub.com/ka2n) </details> <details> <summary>bitnami-labs/sealed-secrets (bitnami-labs/sealed-secrets)</summary> ### [`v0.26.3`](https://togithub.com/bitnami-labs/sealed-secrets/blob/HEAD/RELEASE-NOTES.md#v0263) [Compare Source](https://togithub.com/bitnami-labs/sealed-secrets/compare/v0.26.2...v0.26.3) ##### Changelog - fix: code generation ([#​1536](https://togithub.com/bitnami-labs/sealed-secrets/pull/1536)) - fix: show field name in error message when base64 decoding fails ([#​1519](https://togithub.com/bitnami-labs/sealed-secrets/pull/1519)) - helm: Set `GOMAXPROCS` and `GOMEMLIMIT` environment variables ([#​1528](https://togithub.com/bitnami-labs/sealed-secrets/pull/1528)) - docs: mention limitation of backup with key renewal ([#​1533](https://togithub.com/bitnami-labs/sealed-secrets/pull/1533)) - chore: update dependencies ([#​1535](https://togithub.com/bitnami-labs/sealed-secrets/pull/1535)) - chore: Bump k8s.io/code-generator from 0.30.0 to 0.30.1 ([#​1529](https://togithub.com/bitnami-labs/sealed-secrets/pull/1529)) - chore: Bump k8s.io/client-go from 0.30.0 to 0.30.1 ([#​1532](https://togithub.com/bitnami-labs/sealed-secrets/pull/1532)) - chore: Bump github.com/onsi/ginkgo/v2 from 2.17.2 to 2.17.3 ([#​1527](https://togithub.com/bitnami-labs/sealed-secrets/pull/1527)) - chore: Bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 ([#​1526](https://togithub.com/bitnami-labs/sealed-secrets/pull/1526)) - chore: Bump k8s.io/code-generator from 0.29.3 to 0.30.0 ([#​1513](https://togithub.com/bitnami-labs/sealed-secrets/pull/1513)) - chore: Update dependencies ([#​1524](https://togithub.com/bitnami-labs/sealed-secrets/pull/1524)) - chore: Bump github.com/onsi/gomega from 1.33.0 to 1.33.1 ([#​1522](https://togithub.com/bitnami-labs/sealed-secrets/pull/1522)) - chore: Bump github.com/onsi/ginkgo/v2 from 2.17.1 to 2.17.2 ([#​1520](https://togithub.com/bitnami-labs/sealed-secrets/pull/1520)) - chore: Bump github.com/onsi/gomega from 1.32.0 to 1.33.0 ([#​1512](https://togithub.com/bitnami-labs/sealed-secrets/pull/1512)) - chore: increase vib timeout ([#​1509](https://togithub.com/bitnami-labs/sealed-secrets/pull/1509)) - chore: fix publish-release workflow ([#​1508](https://togithub.com/bitnami-labs/sealed-secrets/pull/1508)) - chore: Bump golang.org/x/crypto from 0.21.0 to 0.22.0 ([#​1505](https://togithub.com/bitnami-labs/sealed-secrets/pull/1505)) </details> <details> <summary>golangci/golangci-lint (golangci/golangci-lint)</summary> ### [`v1.58.2`](https://togithub.com/golangci/golangci-lint/compare/v1.58.1...v1.58.2) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.58.1...v1.58.2) </details> <details> <summary>gruntwork-io/terragrunt (gruntwork-io/terragrunt)</summary> ### [`v0.58.9`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.58.9) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.58.8...v0.58.9) #### Updated CLI args, config attributes and blocks - `output-module-groups` - `remote_state` #### Description - Fixed `output-module-groups` command - Improved logging of S3 encryption warning #### Related links - [gruntwork-io/terragrunt#3144 - [gruntwork-io/terragrunt#3147 ### [`v0.58.8`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.58.8) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.58.7...v0.58.8) #### Description - Fixed S3 bucket URL modifying #### Related links - [gruntwork-io/terragrunt#3146 ### [`v0.58.7`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.58.7) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.58.6...v0.58.7) #### Description - Support all `provider_installation` methods in the CLI config with the provider cache. #### Related links - [gruntwork-io/terragrunt#3133 </details> <details> <summary>helm/helm (helm/helm)</summary> ### [`v3.15.1`](https://togithub.com/helm/helm/compare/v3.15.0...v3.15.1) [Compare Source](https://togithub.com/helm/helm/compare/v3.15.0...v3.15.1) </details> <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.42.0`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.42.0) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.41.0...v0.42.0) <!-- Release notes generated using configuration in .github/release.yml at master --> It's time once again for a Lazygit release! This one is not as colossal as the prior release (and we intend to have smaller, more frequent releases in future) but there are plenty of good improvements here. Thanks to all contributors who helped make this release happen! There's a lot of first-time contributors on this release as well so kudos to you all. Thanks as usual to the wonderful [@​stefanhaller](https://togithub.com/stefanhaller) for creating/reviewing many of these changes, and thanks to [@​karimkhaleel](https://togithub.com/karimkhaleel) who has also stepped up to help out with reviews. #### What's Changed ##### Enhancements 🔥 - Make spinner animation configurable by [@​belyakov-am](https://togithub.com/belyakov-am) in [jesseduffield/lazygit#3463 - Keep the same commit selected when exiting filtering mode by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3416 - Make URLs in confirmation panels clickable, and underline them by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3446 - Allow viewing all branches git log in status view by default [@​oakio](https://togithub.com/oakio) in [jesseduffield/lazygit#3309 - Drop update-ref todos pointing to head by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3456 - Add config options for length of commit hash displayed in commits view by [@​oliviaBahr](https://togithub.com/oliviaBahr) in [jesseduffield/lazygit#3505 - Show commit graph in divergence view by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3537 - Add commitPrefix config for defining a default commit message prefix across all projects by [@​duckbrain](https://togithub.com/duckbrain) in [jesseduffield/lazygit#3291 - Improve `nvim-remote` (neovim) editor mode by [@​cmoog](https://togithub.com/cmoog) in [jesseduffield/lazygit#3508 - Delete and edit custom commands history items by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3534 - Support externalDiffCommand in diffing mode by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3519 ##### Fixes 🔧 - Correctly request force-pushing in a triangular workflow by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3528 - Fix and speed-up stashing partial files for git version >= 2.35.0 by [@​dsolerh](https://togithub.com/dsolerh) in [jesseduffield/lazygit#3569 - Improve delta pager performance by setting the `TERM` env variable by [@​bash](https://togithub.com/bash) in [jesseduffield/lazygit#3420 - Fix deleting update ref todos by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3439 - Fix crash when filtering the keybindings menu by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3450 - Fix excluding files in submodules or worktrees by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3432 - Fix rewording signed commits when the log.showsignature git config is true by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3431 - Better support for terminal based pinentry programs by [@​eldios](https://togithub.com/eldios) in [jesseduffield/lazygit#3478 - Fix amend-to operation not working with non-HEAD merge commit by [@​brandondong](https://togithub.com/brandondong) in [jesseduffield/lazygit#3510 - Fix clicking in status side panel by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3547 - Fix loading commits with very long subjects by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3533 ##### Maintenance ⚙️ - Migrate null keybindings to `<disabled>`, and remove our yaml fork by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3459 - Replace min/max helpers with built-in min/max by [@​Juneezee](https://togithub.com/Juneezee) in [jesseduffield/lazygit#3482 - standardize commit hash commit sha by [@​pikomonde](https://togithub.com/pikomonde) in [jesseduffield/lazygit#3398 - Bump go version to 1.22 by [@​jesseduffield](https://togithub.com/jesseduffield) in [jesseduffield/lazygit#3574 - Simplify error handling by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3502 - Use errors.New instead of fmt.Errorf with no parameters by [@​ChengenH](https://togithub.com/ChengenH) in [jesseduffield/lazygit#3523 - chore: fix some comments and typos by [@​knowmost](https://togithub.com/knowmost) in [jesseduffield/lazygit#3535 - Fix deadlock reporting by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3550 - Only run code coverage report on non-fork branches by [@​jesseduffield](https://togithub.com/jesseduffield) in [jesseduffield/lazygit#3571 - pkg: fix some comment by [@​HongKuang](https://togithub.com/HongKuang) in [jesseduffield/lazygit#3481 - sponsors.yml: Create PR instead of trying to push to a protected branch by [@​SachinVin](https://togithub.com/SachinVin) in [jesseduffield/lazygit#3493 - pkg: fix some typos by [@​thirdkeyword](https://togithub.com/thirdkeyword) in [jesseduffield/lazygit#3364 ##### Docs 📖 - Update interactive rebase demo by [@​jesseduffield](https://togithub.com/jesseduffield) in [jesseduffield/lazygit#3392 - Update Busy.md by [@​eltociear](https://togithub.com/eltociear) in [jesseduffield/lazygit#3433 - Fix schema link in Config.md by [@​stefanhaller](https://togithub.com/stefanhaller) in [jesseduffield/lazygit#3451 #### New Contributors - [@​bash](https://togithub.com/bash) made their first contribution in [jesseduffield/lazygit#3420 - [@​eltociear](https://togithub.com/eltociear) made their first contribution in [jesseduffield/lazygit#3433 - [@​belyakov-am](https://togithub.com/belyakov-am) made their first contribution in [jesseduffield/lazygit#3463 - [@​HongKuang](https://togithub.com/HongKuang) made their first contribution in [jesseduffield/lazygit#3481 - [@​eldios](https://togithub.com/eldios) made their first contribution in [jesseduffield/lazygit#3478 - [@​oakio](https://togithub.com/oakio) made their first contribution in [jesseduffield/lazygit#3309 - [@​pikomonde](https://togithub.com/pikomonde) made their first contribution in [jesseduffield/lazygit#3398 - [@​SachinVin](https://togithub.com/SachinVin) made their first contribution in [jesseduffield/lazygit#3493 - [@​github-actions](https://togithub.com/github-actions) made their first contribution in [jesseduffield/lazygit#3498 - [@​thirdkeyword](https://togithub.com/thirdkeyword) made their first contribution in [jesseduffield/lazygit#3364 - [@​brandondong](https://togithub.com/brandondong) made their first contribution in [jesseduffield/lazygit#3510 - [@​ChengenH](https://togithub.com/ChengenH) made their first contribution in [jesseduffield/lazygit#3523 - [@​oliviaBahr](https://togithub.com/oliviaBahr) made their first contribution in [jesseduffield/lazygit#3505 - [@​knowmost](https://togithub.com/knowmost) made their first contribution in [jesseduffield/lazygit#3535 - [@​duckbrain](https://togithub.com/duckbrain) made their first contribution in [jesseduffield/lazygit#3291 - [@​dsolerh](https://togithub.com/dsolerh) made their first contribution in [jesseduffield/lazygit#3569 - [@​cmoog](https://togithub.com/cmoog) made their first contribution in [jesseduffield/lazygit#3508 **Full Changelog**: jesseduffield/lazygit@v0.41.0...v0.42.0 </details> <details> <summary>kubernetes-sigs/kustomize (kubernetes-sigs/kustomize)</summary> ### [`v5.4.2`](https://togithub.com/kubernetes-sigs/kustomize/releases/tag/kustomize/v5.4.2) [Compare Source](https://togithub.com/kubernetes-sigs/kustomize/compare/kustomize/v5.4.1...kustomize/v5.4.2) #### Feature [#​5294](https://togithub.com/kubernetes-sigs/kustomize/issues/5294): feat: localize absolute paths [#​5556](https://togithub.com/kubernetes-sigs/kustomize/issues/5556): feat: support labels key in transformer configuration #### chore [#​5671](https://togithub.com/kubernetes-sigs/kustomize/issues/5671): refactor: string in slice is now part of stdlib [#​5681](https://togithub.com/kubernetes-sigs/kustomize/issues/5681): chore: remove unused function [#​5688](https://togithub.com/kubernetes-sigs/kustomize/issues/5688): refactor: function in stdlib now #### Dependencies [#​5672](https://togithub.com/kubernetes-sigs/kustomize/issues/5672): chore(deps): bump dependencies of kustomize + sync go workspace [#​5680](https://togithub.com/kubernetes-sigs/kustomize/issues/5680): chore: restore version for github.com/asaskevich/govalidator [#​5702](https://togithub.com/kubernetes-sigs/kustomize/issues/5702): Update kyaml to v0.17.1 [#​5703](https://togithub.com/kubernetes-sigs/kustomize/issues/5703): Update cmd/config to v0.14.1 [#​5704](https://togithub.com/kubernetes-sigs/kustomize/issues/5704): Update api to v0.17.2 </details> <details> <summary>simulot/immich-go (simulot/immich-go)</summary> ### [`v0.14.1`](https://togithub.com/simulot/immich-go/releases/tag/0.14.1) [Compare Source](https://togithub.com/simulot/immich-go/compare/0.14.0...0.14.1) #### Release 0.14.1 "A better UI" This release is focussed the improvement of the user experience. ##### A shiny user interface . _ _ _ _ . _|_ __ _ _ || | || | ||(_| | (_|(_) version dev _) Working with big database and big takeout files take some time. Users are now informed about the progression of different tasks:  The screen presents number of processed photos, how they have been processes, the messages log, and at the bottom, the progression of the 3 mains tasks. ##### A minimalist user interface This shiny interface can be be disabled for quieter user interface (`-no-ui`). The progression is visible. All details on operations are listed in the log file. . _ _ _ _ . _|_ __ _ _ || | || | ||(_| | (_|(_) version dev _) Server status: OK Connected, user: [email protected] Immich read 100%, Google Photos Analysis: 100%, Uploaded 100% Input analysis: ---------------------- scanned image file : 25420 scanned video file : 1447 scanned sidecar file : 26934 discarded file : 197 unsupported file : 0 file duplicated in the input : 1706 associated metadata file : 26867 missing associated metadata file : 0 Uploading: ---------- uploaded : 25160 server error : 0 file not selected : 1 server's asset upgraded with the input : 0 server has same photo : 0 server has a better asset : 0 ##### Immich-go runs simultaneously the collect of immich-server's assets and the analysis of the Google takeout The code has been refactored to run several task simultaneously to animate the progression screen. The program runs now the reading of immich asset and the the takeout analysis in parallel. ##### Immich-go now always produces a log file The default name for the log file is `immich-go YYYY-MM-DD HH-MI-SS.log`, located in the current directory. It's possible to give a path and a name to the log file with the option `-log-file=path/to/file.log`. If the file file exists already, the new messages will be added to its end. The log level `OK` is removed. ##### Immich-go is published under the AGPL-3.0 license I chose the same license as the immich project license to release immich-go. ##### Next steps - Issues closing - A shiny user interface for the command `duplicate` #### Changelog - [`e953522`](https://togithub.com/simulot/immich-go/commit/e953522) Automatically determine commit info with buildinfo ([#​243](https://togithub.com/simulot/immich-go/issues/243)) - [`e4c6ba9`](https://togithub.com/simulot/immich-go/commit/e4c6ba9) Google Takeout 403 Forbidden on non admin user ([#​247](https://togithub.com/simulot/immich-go/issues/247)) - [`f8e7b42`](https://togithub.com/simulot/immich-go/commit/f8e7b42) fix e2e test - [`1acd3c8`](https://togithub.com/simulot/immich-go/commit/1acd3c8) impove the banner - [`1f02717`](https://togithub.com/simulot/immich-go/commit/1f02717) A better user interface ([#​245](https://togithub.com/simulot/immich-go/issues/245)) - [`e13cee4`](https://togithub.com/simulot/immich-go/commit/e13cee4) Create LICENSE ([#​220](https://togithub.com/simulot/immich-go/issues/220)) - [`6634a2a`](https://togithub.com/simulot/immich-go/commit/6634a2a) Simulot/issue205 ([#​206](https://togithub.com/simulot/immich-go/issues/206)) - [`674b165`](https://togithub.com/simulot/immich-go/commit/674b165) Update ci.yml ([#​229](https://togithub.com/simulot/immich-go/issues/229)) - [`f79261d`](https://togithub.com/simulot/immich-go/commit/f79261d) Update readme.md ([#​237](https://togithub.com/simulot/immich-go/issues/237)) - [`9c62473`](https://togithub.com/simulot/immich-go/commit/9c62473) Version 0.13.0 not working as expected ([#​200](https://togithub.com/simulot/immich-go/issues/200)) ### [`v0.14.0`](https://togithub.com/simulot/immich-go/releases/tag/0.14.0) [Compare Source](https://togithub.com/simulot/immich-go/compare/0.13.2...0.14.0) #### Release 0.14.0 "A better UI" This release is focussed the improvement of the user experience. ##### A shiny user interface . _ _ _ _ . _|_ __ _ _ || | || | ||(_| | (_|(_) version dev _) Working with big database and big takeout files take some time. Users are now informed about the progression of different tasks:  The screen presents number of processed photos, how they have been processes, the messages log, and at the bottom, the progression of the 3 mains tasks. ##### A minimalist user interface This shiny interface can be be disabled for quieter user interface (`-no-ui`). The progression is visible. All details on operations are listed in the log file. . _ _ _ _ . _|_ __ _ _ || | || | ||(_| | (_|(_) version dev _) Server status: OK Connected, user: [email protected] Immich read 100%, Google Photos Analysis: 100%, Uploaded 100% Input analysis: ---------------------- scanned image file : 25420 scanned video file : 1447 scanned sidecar file : 26934 discarded file : 197 unsupported file : 0 file duplicated in the input : 1706 associated metadata file : 26867 missing associated metadata file : 0 Uploading: ---------- uploaded : 25160 server error : 0 file not selected : 1 server's asset upgraded with the input : 0 server has same photo : 0 server has a better asset : 0 ##### Immich-go runs simultaneously the collect of immich-server's assets and the analysis of the Google takeout The code has been refactored to run several task simultaneously to animate the progression screen. The program runs now the reading of immich asset and the the takeout analysis in parallel. ##### Immich-go now always produces a log file The default name for the log file is `immich-go YYYY-MM-DD HH-MI-SS.log`, located in the current directory. It's possible to give a path and a name to the log file with the option `-log-file=path/to/file.log`. If the file file exists already, the new messages will be added to its end. The log level `OK` is removed. ##### Immich-go is published under the AGPL-3.0 license I chose the same license as the immich project license to release immich-go. ##### Next steps - Issues closing - A shiny user interface for the command `duplicate` #### Changelog - [`1f02717`](https://togithub.com/simulot/immich-go/commit/1f02717) A better user interface ([#​245](https://togithub.com/simulot/immich-go/issues/245)) - [`e13cee4`](https://togithub.com/simulot/immich-go/commit/e13cee4) Create LICENSE ([#​220](https://togithub.com/simulot/immich-go/issues/220)) - [`6634a2a`](https://togithub.com/simulot/immich-go/commit/6634a2a) Simulot/issue205 ([#​206](https://togithub.com/simulot/immich-go/issues/206)) - [`674b165`](https://togithub.com/simulot/immich-go/commit/674b165) Update ci.yml ([#​229](https://togithub.com/simulot/immich-go/issues/229)) - [`f79261d`](https://togithub.com/simulot/immich-go/commit/f79261d) Update readme.md ([#​237](https://togithub.com/simulot/immich-go/issues/237)) - [`9c62473`](https://togithub.com/simulot/immich-go/commit/9c62473) Version 0.13.0 not working as expected ([#​200](https://togithub.com/simulot/immich-go/issues/200)) - [`2a7f962`](https://togithub.com/simulot/immich-go/commit/2a7f962) chore(deps): bump golangci/golangci-lint-action from 4 to 5 ([#​227](https://togithub.com/simulot/immich-go/issues/227)) - [`d04b35f`](https://togithub.com/simulot/immich-go/commit/d04b35f) chore(deps): bump golangci/golangci-lint-action from 5 to 6 ([#​239](https://togithub.com/simulot/immich-go/issues/239)) - [`eeeb86b`](https://togithub.com/simulot/immich-go/commit/eeeb86b) immich-go appears to retain/cache an API key ([#​214](https://togithub.com/simulot/immich-go/issues/214)) </details> <details> <summary>stern/stern (stern/stern)</summary> ### [`v1.30.0`](https://togithub.com/stern/stern/blob/HEAD/CHANGELOG.md#v1300) [Compare Source](https://togithub.com/stern/stern/compare/v1.29.0...v1.30.0) #### ⚡ Notable Changes ##### Add support for configuring colors for pods and containers You can now configure highlight colors for pods and containers in [the config file](https://togithub.com/stern/stern/blob/master/README.md#config-file) using a comma-separated list of [SGR (Select Graphic Rendition) sequences](https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_\(Select_Graphic_Rendition\)\_parameters). See the ["Customize highlight colors" section](https://togithub.com/stern/stern/blob/master/README.md#customize-highlight-colors) for details. Example configuration: ```yaml ``` </details> <details> <summary>weaveworks/eksctl (weaveworks/eksctl)</summary> ### [`v0.179.0`](https://togithub.com/eksctl-io/eksctl/releases/tag/v0.179.0): eksctl 0.179.0 [Compare Source](https://togithub.com/weaveworks/eksctl/compare/0.178.0-rc.0...0.179.0-rc.0) ### Release v0.179.0 #### 🚀 Features - Support EKS 1.30 ([#​7781](https://togithub.com/weaveworks/eksctl/issues/7781)) ### [`v0.178.0`](https://togithub.com/eksctl-io/eksctl/releases/tag/v0.178.0): eksctl 0.178.0 [Compare Source](https://togithub.com/weaveworks/eksctl/compare/0.177.0...0.178.0-rc.0) ### Release v0.178.0 #### 🐛 Bug Fixes - Fix kubeletExtraConfig support for AL2023 ([#​7758](https://togithub.com/weaveworks/eksctl/issues/7758)) - Update aws-node from 1.12.6 to 1.18.1 ([#​7756](https://togithub.com/weaveworks/eksctl/issues/7756)) #### Acknowledgments The eksctl maintainers would like to sincerely thank [@​consideRatio](https://togithub.com/consideRatio) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 4pm on thursday" in timezone America/Los_Angeles, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/scottames/dots). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImRlcGVuZGVuY2llcyJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: scottames-github-bot[bot] <162828115+scottames-github-bot[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some people push to a different branch (or even remote) than they pull from. One example is described in #3437. Our logic of when to request a force push is not appropriate for these workflows: we check the configured upstream branch for divergence, but that's the one you pull from. We should instead check the push-to branch for divergence.
Fixes #3437.