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 #15491] [MERGED] launch: skip unchanged integration rewrite configration #15174

New Issue
Closed
opened 2026-04-13 01:11:55 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-13 01:11:55 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/15491
Author: @hoyyeva
Created: 4/10/2026
Status: ✅ Merged
Merged: 4/14/2026
Merged by: @hoyyeva

Base: main ← Head: hoyyeva/skip-unchanged-integration-rewrite

📝 Commits (2)

  • d32b419 launch: skip unchanged integration rewrite configration
  • 39be3c3 add test

📊 Changes

2 files changed (+63 additions, -1 deletions)

View changed files

📝 cmd/launch/integrations_test.go (+54 -0)
📝 cmd/launch/launch.go (+9 -1)

📄 Description

Summary

  • Skip prepareEditorIntegration when the resolved model list is identical (same models, same order) to what's already saved, so pressing → on a configured
    multi-model integration or passing --model with the current primary no longer triggers the confirmation prompt, rewrites editor config files, or re-saves
    config.json.
  • Added savedMatchesModels helper (nil-safe — a nil saved config still falls through to the configure flow so first-time setup is unaffected).
  • Added TestSavedMatchesModels covering nil, identical, reordered, subset, and empty cases.

🔄 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/15491 **Author:** [@hoyyeva](https://github.com/hoyyeva) **Created:** 4/10/2026 **Status:** ✅ Merged **Merged:** 4/14/2026 **Merged by:** [@hoyyeva](https://github.com/hoyyeva) **Base:** `main` ← **Head:** `hoyyeva/skip-unchanged-integration-rewrite` --- ### 📝 Commits (2) - [`d32b419`](https://github.com/ollama/ollama/commit/d32b4197b2762ebc111f0126fe471c1303725523) launch: skip unchanged integration rewrite configration - [`39be3c3`](https://github.com/ollama/ollama/commit/39be3c34d8449d1db06944605a3a57e71917e5a4) add test ### 📊 Changes **2 files changed** (+63 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `cmd/launch/integrations_test.go` (+54 -0) 📝 `cmd/launch/launch.go` (+9 -1) </details> ### 📄 Description **Summary** - Skip prepareEditorIntegration when the resolved model list is identical (same models, same order) to what's already saved, so pressing → on a configured multi-model integration or passing --model with the current primary no longer triggers the confirmation prompt, rewrites editor config files, or re-saves config.json. - Added savedMatchesModels helper (nil-safe — a nil saved config still falls through to the configure flow so first-time setup is unaffected). - Added TestSavedMatchesModels covering nil, identical, reordered, subset, and empty cases. --- <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-13 01:11:55 -05:00
GiteaMirror changed title from [PR #15491] launch: skip unchanged integration rewrite configration to [PR #15491] [MERGED] launch: skip unchanged integration rewrite configration 2026-04-16 07:36:38 -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#15174
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?