git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Anders Kaseorg <andersk@mit.edu>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Jeff King <peff@peff.net>,
	git@vger.kernel.org, Andreas Heiduk <andreas.heiduk@mathema.de>
Subject: Re: [PATCH v4 1/4] fetch: Protect branches checked out in all worktrees
Date: Tue, 09 Nov 2021 15:00:41 -0800	[thread overview]
Message-ID: <xmqqa6id0w9y.fsf@gitster.g> (raw)
In-Reply-To: <316e8579-d720-b40e-66fb-3280e8de1922@mit.edu> (Anders Kaseorg's message of "Tue, 9 Nov 2021 14:52:36 -0800")

Anders Kaseorg <andersk@mit.edu> writes:

>>> +	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.

  reply	other threads:[~2021-11-09 23:00 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-08 20:16 [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-08 23:28 ` Junio C Hamano
2021-11-09  0:44   ` Junio C Hamano
2021-11-09 16:04     ` Johannes Schindelin
2021-11-09  1:10   ` Anders Kaseorg
2021-11-09  3:00     ` [PATCH v4 1/4] fetch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-09  3:00       ` [PATCH v4 2/4] receive-pack: Clean dead code from update_worktree() Anders Kaseorg
2021-11-09 16:16         ` Johannes Schindelin
2021-11-09 22:58           ` Anders Kaseorg
2021-11-09  3:00       ` [PATCH v4 3/4] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-09 16:22         ` Johannes Schindelin
2021-11-09 23:03           ` Anders Kaseorg
2021-11-09 23:09             ` [PATCH v5 1/4] fetch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-09 23:09               ` [PATCH v5 2/4] receive-pack: Clean dead code from update_worktree() Anders Kaseorg
2021-11-10  3:57                 ` Ævar Arnfjörð Bjarmason
2021-11-10 12:11                   ` Johannes Schindelin
2021-11-09 23:09               ` [PATCH v5 3/4] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-10  4:00                 ` Ævar Arnfjörð Bjarmason
2021-11-09 23:09               ` [PATCH v5 4/4] branch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-10  4:03                 ` Ævar Arnfjörð Bjarmason
2021-11-10  3:56               ` [PATCH v5 1/4] fetch: " Ævar Arnfjörð Bjarmason
2021-11-10 12:18               ` Johannes Schindelin
2021-11-10 23:46                 ` Junio C Hamano
2021-11-11  0:11                   ` Junio C Hamano
2021-11-10 22:09               ` Junio C Hamano
2021-11-10 23:33                 ` Anders Kaseorg
2021-11-09  3:00       ` [PATCH v4 4/4] branch: " Anders Kaseorg
2021-11-09 16:24         ` Johannes Schindelin
2021-11-09 16:09       ` [PATCH v4 1/4] fetch: " Johannes Schindelin
2021-11-09 22:52         ` Anders Kaseorg
2021-11-09 23:00           ` Junio C Hamano [this message]
2021-11-09 23:28             ` Junio C Hamano
2021-11-09 23:32               ` Anders Kaseorg
2021-11-09 15:37   ` [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqa6id0w9y.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=andersk@mit.edu \
    --cc=andreas.heiduk@mathema.de \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).