Skip to content

Comments

[v5] git: worktree, Don't delete local untracked files when resetting worktree#1800

Merged
pjbgf merged 1 commit intogo-git:releases/v5.xfrom
Ch00k:no-delete-untracked-v5
Dec 15, 2025
Merged

[v5] git: worktree, Don't delete local untracked files when resetting worktree#1800
pjbgf merged 1 commit intogo-git:releases/v5.xfrom
Ch00k:no-delete-untracked-v5

Conversation

@Ch00k
Copy link
Contributor

@Ch00k Ch00k commented Dec 13, 2025

Backporting aa09c63 to v5.

…tree

Co-authored-by: Anshul Khandelwal <12948312+k-anshul@users.noreply.github.com>
Co-authored-by: Daan Schoone <d.schoone@presspage.com>
Signed-off-by: Paulo Gomes <pjbgf@linux.com>
@Ch00k
Copy link
Contributor Author

Ch00k commented Dec 13, 2025

@pjbgf tagging you as requested in #1540 (comment)

Copy link
Member

@pjbgf pjbgf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ch00k thanks for backporting this. 🙇

@pjbgf pjbgf merged commit 25f1624 into go-git:releases/v5.x Dec 15, 2025
12 checks passed
arthurzam pushed a commit to gentoo-golang-dist/forgejo-runner that referenced this pull request Feb 19, 2026
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | `v5.16.4` -> `v5.16.5` | ![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgo-git%2fgo-git%2fv5/v5.16.5?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgo-git%2fgo-git%2fv5/v5.16.4/v5.16.5?slim=true) |

---

### Release Notes

<details>
<summary>go-git/go-git (github.com/go-git/go-git/v5)</summary>

### [`v5.16.5`](https://github.com/go-git/go-git/releases/tag/v5.16.5)

[Compare Source](go-git/go-git@v5.16.4...v5.16.5)

#### What's Changed

- build: Update module golang.org/x/crypto to v0.45.0 \[SECURITY] (releases/v5.x) by [@&#8203;go-git-renovate](https://github.com/go-git-renovate)\[bot] in [#&#8203;1744](go-git/go-git#1744)
- build: Bump Go test versions to 1.23-1.25 (v5) by [@&#8203;pjbgf](https://github.com/pjbgf) in [#&#8203;1746](go-git/go-git#1746)
- \[v5] git: worktree, Don't delete local untracked files when resetting worktree by [@&#8203;Ch00k](https://github.com/Ch00k) in [#&#8203;1800](go-git/go-git#1800)
- Expand packfile checks by [@&#8203;pjbgf](https://github.com/pjbgf) in [#&#8203;1836](go-git/go-git#1836)

**Full Changelog**: <go-git/go-git@v5.16.4...v5.16.5>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My41LjAiLCJ1cGRhdGVkSW5WZXIiOiI0My41LjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIktpbmQvRGVwZW5kZW5jeVVwZGF0ZSIsInJ1bi1lbmQtdG8tZW5kLXRlc3RzIl19-->

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/1365
Reviewed-by: Mathieu Fenniak <mfenniak@noreply.code.forgejo.org>
Co-authored-by: Renovate Bot <bot@kriese.eu>
Co-committed-by: Renovate Bot <bot@kriese.eu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants