On 2024-06-03 at 06:28:41, Arundas T C wrote: > Thank you for filling out a Git bug report! > Please answer the following questions to help us understand your issue. > > What did you do before the bug happened? (Steps to reproduce your issue) > > 1. In a remote repository, have a commit that's only in remote at the > tip of the current branch in local. > 2. In the local clone of this repository, edit some files and have > unstaged changes. > 3. In local, run `git pull --ff-only`. > > What did you expect to happen? (Expected behavior) > > Fast-forward the local branch to match the remote branch, similar to > `git merge --ff-only`. Handle any merge conflicts the same way that > `git merge --ff-only` does. > > What happened instead? (Actual behavior) > > error: cannot pull with rebase: You have unstaged changes. > error: Please commit or stash them. This indicates that you've set pull.rebase, so a `git pull` does a fetch and a rebase. > What's different between what you expected and what actually happened? > > It errored out because of unstaged changes, even though doing `git > merge --ff-only` will correctly do what's expected. See below. > > Anything else you want to add: > > After doing `git fetch`, I can do `git merge --ff-only` and this > fast-forwards the branch as expected. Isn't `git pull --ff-only` > basically the same as doing these two (fetch and merge)? `git merge` doesn't do a rebase. It does a merge, which can sometimes be done with a dirty tree. `git pull` _normally_ does a fetch and a merge, but in this case, you've asked it to do a fetch and a rebase, which has different constraints. The result will almost certainly be identical (since it's just a fast-forward), but rebases typically don't allow you to have a dirty working tree. -- brian m. carlson (they/them or he/him) Toronto, Ontario, CA
Attachment:
signature.asc
Description: PGP signature
