[Expo-tech] Git setup /gitkraken

[Wookey]

On 2019-07-02 18:24 +0100, Sam Wenham wrote:
> I have fixed this by changing the config on the server to
> 
> git config --local receive.denyCurrentBranch updateInstead
> 
> This causes git to checkout the current branch rather than object to
> your push.
> 
> We now must not make changes on the server and leave them not checked
> in.

Could you explain what this is about?

> Actually I would go for don't make changes on the server at all.

Why? That's quite inconvenient.
 
> We could have a copy of the repo that is bare that is for the repo
> serving and another copy that is for the web server that has master
> checked out. Now we are using git we should make more use of branches
> for changes and merges to apply the change to master.

Hmm. This was billed as a simple change of VCS, not everything about
how we do things. The above seems to be losing the simplicity we
previously had.

> If you do leave uncommitted changes kicking around on the server you
> will get this
> 
> To ssh://expo.survex.com/~/troggle
>  ! [remote rejected] master -> master (Working directory has unstaged
> changes)

Mercurial would accept pushed changes but not necessarily expose them
if there were also local changes. Can we not get git to do the same
thing? I don't think refusing non-clashing pushes is the right thing
to do.

Wookey
-- 
Principal hats:  Linaro, Debian, Wookware, ARM
http://wookware.org/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.wookware.org/pipermail/expo-tech/attachments/20190703/3424497d/attachment.sig>