github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 00:22:43 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #3958] [MERGED] use merge base for diff-tree #11336

New Issue
Closed
opened 2026-04-12 23:28:09 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-12 23:28:09 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/3958
Author: @mxyng
Created: 4/26/2024
Status: ✅ Merged
Merged: 4/26/2024
Merged by: @mxyng

Base: main ← Head: mxyng/fix-workflow

📝 Commits (1)

  • 6fef042 use merge base for diff-tree

📊 Changes

1 file changed (+3 additions, -1 deletions)

View changed files

📝 .github/workflows/test.yaml (+3 -1)

📄 Description

the diff-tree previously compared the head ref (the latest commit in the PR) against the base ref (the latest commit in the target branch). if the target branch is updated, this comparison will include the new files in the target as well which is wrong.

instead, find and compare the head ref against the merge base of the head and base refs. this should ensure only the changes added in the pr are evaluated

🔄 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/3958 **Author:** [@mxyng](https://github.com/mxyng) **Created:** 4/26/2024 **Status:** ✅ Merged **Merged:** 4/26/2024 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `mxyng/fix-workflow` --- ### 📝 Commits (1) - [`6fef042`](https://github.com/ollama/ollama/commit/6fef042f0b3157fb46426ef3c1e71e53b444ce21) use merge base for diff-tree ### 📊 Changes **1 file changed** (+3 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/test.yaml` (+3 -1) </details> ### 📄 Description the diff-tree previously compared the head ref (the latest commit in the PR) against the base ref (the latest commit in the target branch). if the target branch is updated, this comparison will include the new files in the target as well which is wrong. instead, find and compare the head ref against the merge base of the head and base refs. this should ensure only the changes added in the pr are evaluated --- <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-12 23:28:09 -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#11336
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?