github-starred/yaak
2
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-05-07 02:21:59 -05:00
Code Issues 71 Packages Projects Releases 101 Wiki Activity

[PR #394] [MERGED] Fix git pull conflicts with pull.ff=only and improve commit UX #944

New Issue
Closed
opened 2026-04-20 19:53:22 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-20 19:53:22 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/mountain-loop/yaak/pull/394
Author: @gschier
Created: 2/12/2026
Status: ✅ Merged
Merged: 2/13/2026
Merged by: @gschier

Base: main ← Head: fix/git-pull-and-commit-improvements

📝 Commits (2)

  • d84fec8 Fix git pull conflicts with pull.ff=only and improve commit UX
  • f27d500 Merge branch 'main' into fix/git-pull-and-commit-improvements

📊 Changes

5 files changed (+51 additions, -27 deletions)

View changed files

📝 crates/yaak-git/src/pull.rs (+39 -17)
📝 src-web/components/git/GitCommitDialog.tsx (+8 -4)
📝 src-web/components/git/GitDropdown.tsx (+0 -2)
📝 src-web/components/git/callbacks.tsx (+2 -2)
📝 src-web/components/git/showAddRemoteDialog.tsx (+2 -2)

📄 Description

There were some strange bugs caused by using git pull before, which seem to be eliminated when doing fetch+merge instead.

  • Fix git pull with pull.ff=only: Replace git pull with git fetch + git merge --ff-only to avoid conflicts between the global pull.ff=only config and the background fetch --all that runs when the git dropdown opens
  • Disable commit buttons when message is empty: The Commit and Commit and Push buttons are now disabled when the commit message is blank
  • Always show Push/Pull menu items: Push and Pull are no longer hidden when no remotes are configured (they prompt to add one)
  • Default remote name to origin: The Add Remote dialog now defaults the name field to "origin"

🔄 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/mountain-loop/yaak/pull/394 **Author:** [@gschier](https://github.com/gschier) **Created:** 2/12/2026 **Status:** ✅ Merged **Merged:** 2/13/2026 **Merged by:** [@gschier](https://github.com/gschier) **Base:** `main` ← **Head:** `fix/git-pull-and-commit-improvements` --- ### 📝 Commits (2) - [`d84fec8`](https://github.com/mountain-loop/yaak/commit/d84fec8c7c1dee4369cf062d14b41ffd964efc92) Fix git pull conflicts with pull.ff=only and improve commit UX - [`f27d500`](https://github.com/mountain-loop/yaak/commit/f27d500a2c3a4d4420ce42cd5888b6fcb1788f9c) Merge branch 'main' into fix/git-pull-and-commit-improvements ### 📊 Changes **5 files changed** (+51 additions, -27 deletions) <details> <summary>View changed files</summary> 📝 `crates/yaak-git/src/pull.rs` (+39 -17) 📝 `src-web/components/git/GitCommitDialog.tsx` (+8 -4) 📝 `src-web/components/git/GitDropdown.tsx` (+0 -2) 📝 `src-web/components/git/callbacks.tsx` (+2 -2) 📝 `src-web/components/git/showAddRemoteDialog.tsx` (+2 -2) </details> ### 📄 Description There were some strange bugs caused by using `git pull` before, which seem to be eliminated when doing fetch+merge instead. - **Fix git pull with `pull.ff=only`**: Replace `git pull` with `git fetch` + `git merge --ff-only` to avoid conflicts between the global `pull.ff=only` config and the background `fetch --all` that runs when the git dropdown opens - **Disable commit buttons when message is empty**: The Commit and Commit and Push buttons are now disabled when the commit message is blank - **Always show Push/Pull menu items**: Push and Pull are no longer hidden when no remotes are configured (they prompt to add one) - **Default remote name to origin**: The Add Remote dialog now defaults the name field to "origin" --- <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-20 19:53:22 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
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/yaak#944
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?