Hi Alex
On 05/07/2021 20:48, Alex Henrie wrote:
On Mon, Jul 5, 2021 at 10:50 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
Looking at origin/seen:builtin/pull.c we already check if we can
fast-forward and unconditionally merge in that case irrespective of
any '--rebase' option or pull.rebase config. It should be simple for
pull to error out if '--ff-only' is given and we cannot fast-forward.
Excellent.
Even though teaching even more special case on the "git pull" side
makes me feel somewhat dirty, but I think it would be a small price
to pay, and the end result would save an useless fork whose sole
purpose is to make the integration step after fetch fail when "pull"
can easily tell, as you said, that it ought to fail, so overall it
would probably be a net win.
Okay, so it sounds like I should just scrap this patch and try again,
after "pull: cleanup autostash check" is in master, with a patch that
only modifies `git pull` and not `git rebase`. (Unless someone more
experienced wants to take over, which would be fine by me.)
I don't think you need to wait, if necessary you could base your patches
on top of that branch. Junio's latest what's cooking email said he was
going to merge that branch into next so it is unlikely to change. In any
case looking at the 'git diff origin/master origin/seen builtin/pull.c'
I suspect the changes required won't conflict with that branch.
Thanks anyway to Phillip and Ævar: Your feedback will help me write
better patches in the future.
You're welcome, I look forward to reading your future patches
Best wishes
Phillip
-Alex
