Re: [PATCH v4 1/4] fetch: Protect branches checked out in all worktrees
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 9, 2021, 23:00 UTC
- Message-ID
- <xmqqa6id0w9y.fsf@gitster.g>
- In-Reply-To
- <316e8579-d720-b40e-66fb-3280e8de1922@mit.edu>
Anders Kaseorg <andersk@mit.edu> writes:
Show 7 quoted lines
>>> + git fetch -u . HEAD:wt >> Maybe even `test_path_exists wt/apple.t`, to verify that the >> worktree has >> been updated? > > Not here; git fetch -u never updates working trees, not even the main > working tree.
Correct. The "--update-head-ok" option was invented to let the user tell Git this: I know updating the ref may make the relationship between HEAD, the index and the working tree inconsistent, and you will normally prevent me from doing so to save me trouble. But in this call, I will reconcile the inconsistencies myself, so do not worry about the issue and just update the ref.
So there is nothing to fix here. If the user wanted to update the working tree, taking the material that was just fetched from the other side into account, "git pull" would have been used instead.
Thanks.