[PATCH v3 0/1] Support updating working trees when pushing into non-bare repos

2014-11-13 Thread Johannes Schindelin
This patch series adds support for a new receive.denyCurrentBranch setting to update the working directory (which must be clean, i.e. there must not be any uncommitted changes) when pushing into the current branch. The scenario in which the 'updateInstead' setting became a boon in this

Re: [PATCH v3 0/1] Support updating working trees when pushing into non-bare repos

2014-11-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: -static const char *merge_worktree(unsigned char *sha1) +static const char *update_worktree(unsigned char *sha1) { const char *update_refresh[] = { update-index, --ignore-submodules, --refresh, NULL }; +const char

Re: [PATCH v3 0/1] Support updating working trees when pushing into non-bare repos

2014-11-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Nov 2014, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: This patch series adds support for a new receive.denyCurrentBranch setting to update the working directory (which must be clean, i.e. there must not be any uncommitted changes)