{"thread":{"id":"57732","subject":"git subtree pull fails with gitconfig merge ff = only","startedAt":"2022-04-14T19:33:08Z","lastAt":"2022-04-14T19:33:08Z","messageCount":1,"participants":["Tyson Holub"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"453669","messageId":"CAFboxAHGKGTSbyFaFjPCjnTMzz+N=jhX19_zoexC6U=pCLCeXQ@mail.gmail.com","threadId":"57732","inReplyTo":null,"subject":"git subtree pull fails with gitconfig merge ff = only","fromName":"Tyson Holub","fromEmail":"tyson@gozynta.com","sentAt":"2022-04-14T19:32:51Z","receivedAt":"2022-04-14T19:33:08Z","isPatch":false,"sender":{"key":"tyson@gozynta.com","avatar":null},"body":"Hi,\n\nPlease see the bug report below.\n\nThanks,\nTyson\n\nThank you for filling out a Git bug report!\nPlease answer the following questions to help us understand your issue.\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\nupdate ~/.gitconfig with\n  [merge]\n        ff = only\n\nadd git subtree to repo\n  git subtree add --prefix subtree-path git@gitlab.com:some-repo.git\nmain --squash\n\npush new commit to git@gitlab.com:some-repo.git\n\ntry to pull subtree commit\n  $ git subtree pull --prefix subtree-path\ngit@gitlab.com:some-repo.git main --squash\n  From gitlab.com:some-repo\n   * branch            main       -> FETCH_HEAD\n  fatal: Not possible to fast-forward, aborting.\n\nWhat did you expect to happen? (Expected behavior)\nexpect git subtree to be able to merge even if default option is ff,\nor provide git subtree pull with a --no-ff override\n\nWhat happened instead? (Actual behavior)\nsubtree updates do not seem possible to pull with merge ff = only\n\nWhat's different between what you expected and what actually happened?\nsubtree pull doesn't work\n\nAnything else you want to add:\ngit subtree works after removing merge ff = only\n\nPlease review the rest of the bug report below.\nYou can delete any lines you don't wish to share.\n\n\n[System Info]\ngit version:\ngit version 2.35.3\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Linux 5.16.11-76051611-generic\n#202202230823~1646248261~21.10~2b22243 SMP PREEMPT Wed Mar 2 20:\nx86_64\ncompiler info: gnuc: 11.2\nlibc info: glibc: 2.34\n$SHELL (typically, interactive shell): /bin/bash\n\n\n[Enabled Hooks]\npre-commit\n"}]}