github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-09 01:59:50 -05:00
Code Issues 14.6k Packages Projects Releases 122 Wiki Activity

[PR #7141] [MERGED] Fix build leakages #17597

New Issue
Closed
opened 2026-04-16 06:07:58 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-16 06:07:58 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/7141
Author: @dhiltgen
Created: 10/8/2024
Status: ✅ Merged
Merged: 10/8/2024
Merged by: @dhiltgen

Base: main ← Head: build_leaks

📝 Commits (1)

📊 Changes

2 files changed (+2 additions, -10 deletions)

View changed files

📝 llama/Makefile (+1 -1)
📝 llm/generate/gen_common.sh (+1 -9)

📄 Description

The recent change to applying patches leaves the submodule dirty based on "new commits" being present. This ensures we clean up so the tree no longer reports dirty after a go generate ./... run.

The Makefile was being a bit too aggressive in cleaning things up and would result in deleting the placeholder files which someone might accidentally commit.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/7141 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 10/8/2024 **Status:** ✅ Merged **Merged:** 10/8/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `build_leaks` --- ### 📝 Commits (1) - [`d0708cf`](https://github.com/ollama/ollama/commit/d0708cf8c3d33493e492721ec43f36a07783e816) Fix build leakages ### 📊 Changes **2 files changed** (+2 additions, -10 deletions) <details> <summary>View changed files</summary> 📝 `llama/Makefile` (+1 -1) 📝 `llm/generate/gen_common.sh` (+1 -9) </details> ### 📄 Description The recent change to applying patches leaves the submodule dirty based on "new commits" being present. This ensures we clean up so the tree no longer reports dirty after a `go generate ./...` run. The Makefile was being a bit too aggressive in cleaning things up and would result in deleting the placeholder files which someone might accidentally commit. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-16 06:07:58 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#17597
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?