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 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) when pushing into the

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 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 *diff

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

2014-11-13 Thread Junio C Hamano
Johannes Schindelin 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) when pushing into the current branch. > > The scenario in which the 'updateInstead' se