From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org, Jens Lehmann <Jens.Lehmann@web•de>,
Heiko Voigt <hvoigt@hvoigt•net>
Subject: Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules
Date: Mon, 10 Nov 2014 11:32:34 -0800 [thread overview]
Message-ID: <xmqq389qam25.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq1tpbawqe.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 10 Nov 2014 07:42:01 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> Dying when "update-index --refresh" signals a difference is an
> attempt to mimic #1, but it is in line with the spirit of the reason
> why a user would want to use updateInstead, I think. The situation
> is more like the person who pushed into your repository from
> sideline did a "checkout -B $current_branch $new_commit" to update
> the HEAD, the index and the working tree, to let you pretend as if
> you based your work on the commit he pushed to you.
>
> While you still need to error out when your local work does not
> satisfy the cleanliness criteria #3 above, I do not think you would
> want to stop the operation when "checkout" would not fail, e.g. you
> have a local change that does not interfere with the update between
> the two commits, with this one:
>
> + if (run_command(&child))
> + die ("Could not refresh the index");
>
> When refreshed the index successfully, we signal that there were
> differences between the index and the working tree with a non-zero
> return value, so "Could not refresh" is not quite right, either.
Just to make sure. I am *not* saying that you do not need to run
"update-index --refresh". It is necessary before running read-tree
to avoid false dirtyness, so you do need to run it.
I am only saying that it is too strict to fail the operation when
the command reports that you have a local modification in the
working tree.
> But this one that checks the exit status from two-tree read-tree
>
> + if (run_command(&child))
> + die ("Could not merge working tree with new HEAD. Good luck.");
>
> is checking the right condition, i.e. cleanliness #3. The
> disposition should not be "die", but an error return to tell the
> caller to abort the push as we discussed earlier.
next prev parent reply other threads:[~2014-11-10 19:32 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 13:58 [PATCH 0/2] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-07 13:58 ` [PATCH 1/2] Add a few more values for receive.denyCurrentBranch Johannes Schindelin
2014-11-07 18:49 ` Junio C Hamano
2014-11-07 18:58 ` Johannes Schindelin
2014-11-10 12:54 ` Johannes Schindelin
2014-11-10 16:00 ` Junio C Hamano
2014-11-12 11:13 ` Johannes Schindelin
2014-11-12 18:00 ` Junio C Hamano
2014-11-08 11:18 ` Jeff King
2014-11-08 18:48 ` brian m. carlson
2014-11-10 13:03 ` Johannes Schindelin
2014-11-07 13:58 ` [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules Johannes Schindelin
2014-11-07 19:20 ` Junio C Hamano
2014-11-09 16:42 ` Jens Lehmann
2014-11-10 13:04 ` Johannes Schindelin
2014-11-10 13:01 ` Johannes Schindelin
2014-11-10 15:42 ` Junio C Hamano
2014-11-10 19:32 ` Junio C Hamano [this message]
2014-11-12 11:09 ` Johannes Schindelin
2014-11-12 17:59 ` Junio C Hamano
2014-11-13 10:29 ` Johannes Schindelin
2014-11-13 10:38 ` Johannes Schindelin
2014-11-13 17:41 ` Junio C Hamano
2014-11-13 18:55 ` Johannes Schindelin
2014-11-13 19:48 ` Junio C Hamano
2014-11-13 21:06 ` Junio C Hamano
2014-11-14 7:49 ` Junio C Hamano
2014-12-02 3:24 ` Junio C Hamano
2014-12-02 3:25 ` [PATCH 2/2] receive-pack: support push-to-checkout hook Junio C Hamano
2014-12-02 8:47 ` Johannes Schindelin
2014-12-02 13:03 ` Michael J Gruber
2014-12-02 13:25 ` Johannes Schindelin
2014-12-02 16:39 ` Junio C Hamano
2014-12-02 16:45 ` Johannes Schindelin
2014-12-02 17:00 ` Junio C Hamano
2014-12-02 17:12 ` Johannes Schindelin
2014-12-02 17:19 ` Junio C Hamano
2014-11-13 17:41 ` [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules Junio C Hamano
2014-11-12 11:06 ` Johannes Schindelin
2014-11-10 14:38 ` [PATCH v2 0/2] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-13 11:03 ` [PATCH v3 0/1] " Johannes Schindelin
2014-11-13 11:03 ` [PATCH v3 1/1] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-11-13 17:51 ` Junio C Hamano
2014-11-13 19:21 ` Johannes Schindelin
2014-11-13 17:47 ` [PATCH v3 0/1] Support updating working trees when pushing into non-bare repos Junio C Hamano
2014-11-13 19:11 ` Junio C Hamano
2014-11-13 19:18 ` Johannes Schindelin
2014-11-26 20:21 ` [PATCH v4] " Johannes Schindelin
2014-11-26 20:21 ` [PATCH v4] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-11-26 21:02 ` Junio C Hamano
2014-11-26 22:44 ` [PATCH v5] Support updating working trees when pushing into non-bare repos Johannes Schindelin
2014-11-26 22:44 ` [PATCH v5] Add another option for receive.denyCurrentBranch Johannes Schindelin
2014-12-01 3:18 ` Junio C Hamano
2014-12-01 7:44 ` Johannes Schindelin
2014-12-01 23:49 ` Junio C Hamano
2014-12-02 0:51 ` Junio C Hamano
2014-12-02 8:21 ` Johannes Schindelin
2014-12-02 16:20 ` Junio C Hamano
2014-12-02 16:51 ` Johannes Schindelin
2014-12-02 17:23 ` Junio C Hamano
[not found] ` <cover.1415630072.git.johannes.schindelin@gmx.de>
2014-11-10 14:38 ` [PATCH v2 1/2] Clean stale environment pointer in finish_command() Johannes Schindelin
2014-11-10 14:41 ` Johannes Schindelin
2014-11-11 3:16 ` Jeff King
2014-11-11 15:55 ` Junio C Hamano
2014-11-12 10:45 ` Johannes Schindelin
2014-11-12 10:52 ` Jeff King
2014-11-12 10:59 ` Jeff King
2014-11-12 16:17 ` Junio C Hamano
2014-11-10 21:44 ` Junio C Hamano
2014-11-11 3:11 ` Jeff King
2014-11-10 14:38 ` [PATCH v2 2/2] Add a few more options for receive.denyCurrentBranch 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq389qam25.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox