From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 13 Nov 2014 10:38:25 GMT
Subject: Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules
Message-ID: <alpine.DEB.1.00.1411131136200.13845@s15462909.onlinehome-server.info>
In-Reply-To: <alpine.DEB.1.00.1411131123330.13845@s15462909.onlinehome-server.info>

Hi Junio,

On Thu, 13 Nov 2014, Johannes Schindelin wrote:

> Due to that experience, the documentation also states pretty clearly that
> `updateInstead` succeeds only in updating the current branch if the
> working directory is clean.

To clarify why `updateInstead` is stricter than the `merge` scenario: when
pushing into a remote repository with attached working directory, we
cannot simply clean up merge conflicts or other problems introduced by a
merge. Indeed, it is even possible to push without having any option to
fix files in the working directory afterwards. Therefore, the
`updateInstead` feature really needs to be adamant about the working
directory being clean.

Ciao,
Johannes