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

[GH-ISSUE #6183] LINE FEED problems in recent commit #65898

New Issue
Closed
opened 2026-05-03 23:06:54 -05:00 by GiteaMirror · 5 comments
GiteaMirror commented 2026-05-03 23:06:54 -05:00
Owner
Copy Link

Originally created by @FellowTraveler on GitHub (Aug 5, 2024).
Original GitHub issue: https://github.com/ollama/ollama/issues/6183

What is the issue?

Since I grabbed the latest code, it IMMEDIATELY tells me that I have unstaged changes and won't let me checkout other branches. Also makes it impossible to rebase, etc. Git stash doesn't fix it. There is some kind of line feed issue probably in a very recent merge.
I can't be the only one who has noticed this problem.

OS

macOS

GPU

Apple

CPU

Apple

Ollama version

LATEST main branch

Originally created by @FellowTraveler on GitHub (Aug 5, 2024). Original GitHub issue: https://github.com/ollama/ollama/issues/6183 ### What is the issue? Since I grabbed the latest code, it IMMEDIATELY tells me that I have unstaged changes and won't let me checkout other branches. Also makes it impossible to rebase, etc. Git stash doesn't fix it. There is some kind of line feed issue probably in a very recent merge. **I can't be the only one who has noticed this problem.** ### OS macOS ### GPU Apple ### CPU Apple ### Ollama version LATEST main branch
GiteaMirror added the bug label 2026-05-03 23:06:54 -05:00
GiteaMirror commented 2026-05-03 23:06:58 -05:00
Author
Owner
Copy Link

@rick-github commented on GitHub (Aug 5, 2024):

https://github.com/ollama/ollama/pull/6167

<!-- gh-comment-id:2269517913 --> @rick-github commented on GitHub (Aug 5, 2024): https://github.com/ollama/ollama/pull/6167
GiteaMirror commented 2026-05-03 23:06:58 -05:00
Author
Owner
Copy Link

@FellowTraveler commented on GitHub (Aug 6, 2024):

LOOK at this! What the hell is going on?

image
<!-- gh-comment-id:2270391194 --> @FellowTraveler commented on GitHub (Aug 6, 2024): **LOOK at this! What the hell is going on?** <img width="774" alt="image" src="https://github.com/user-attachments/assets/204f5eb7-d530-4c73-a022-e374f5f5cce5">
GiteaMirror commented 2026-05-03 23:06:59 -05:00
Author
Owner
Copy Link

@Nicholas42 commented on GitHub (Aug 7, 2024):

I have the same problem, it seems to be caused by the line * text eol=lf line in .gitattributes. I fix it in #6235.

<!-- gh-comment-id:2273851769 --> @Nicholas42 commented on GitHub (Aug 7, 2024): I have the same problem, it seems to be caused by the line `* text eol=lf` line in `.gitattributes`. I fix it in #6235.
GiteaMirror commented 2026-05-03 23:07:00 -05:00
Author
Owner
Copy Link

@igorschlum commented on GitHub (Aug 10, 2024):

Hi @FellowTraveler
the merge was approve on Github. Could you try and if git works well on your Mac with Ollama, please close this issue.

<!-- gh-comment-id:2280486264 --> @igorschlum commented on GitHub (Aug 10, 2024): Hi @FellowTraveler the merge was approve on Github. Could you try and if git works well on your Mac with Ollama, please close this issue.
GiteaMirror commented 2026-05-03 23:07:00 -05:00
Author
Owner
Copy Link

@FellowTraveler commented on GitHub (Aug 11, 2024):

Looks fixed.

<!-- gh-comment-id:2282641534 --> @FellowTraveler commented on GitHub (Aug 11, 2024): Looks fixed.
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 bug
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#65898
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?