<div dir="ltr">Cool. Have successfully pulled that lot, merged my readme.txt and pushed OK.<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 9 Jul 2019 at 17:47, Wookey <<a href="mailto:wookey@wookware.org">wookey@wookware.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 2019-07-09 16:02 +0100, Philip Sargent (Gmail) wrote:<br>
> Sam or Wookey,<br>
> can you do this same fix (see email below) to the ::drawings:: repo ?<br>
<br>
You can do this too. Just log into the server as expo and change to<br>
the git repo in question, i.e.:<br>
<br>
ssh <a href="mailto:expo@expo.survex.com" target="_blank">expo@expo.survex.com</a><br>
cd ~/repositories/git/drawings<br>
git config --local receive.denyCurrentBranch updateInstead<br>
<br>
(I've done it now).<br>
<br>
There are a load of modified files in there when have been changed to<br>
have their DOS-derived 'execute' bits removed. mostly 2017-gmh but<br>
also a few in therion dir. I've checked that in.<br>
<br>
> I have created a readme.txt file which I can't push.<br>
> <br>
> On Tue, 2 Jul 2019 at 18:25, Sam Wenham <<a href="mailto:sam@wenhams.co.uk" target="_blank">sam@wenhams.co.uk</a>> wrote:<br>
> <br>
> I have fixed this by changing the config on the server to<br>
> <br>
> git config --local receive.denyCurrentBranch updateInstead<br>
> <br>
> This causes git to checkout the current branch rather than object to<br>
> your push.<br>
> <br>
> We now must not make changes on the server and leave them not checked<br>
> in. Actually I would go for don't make changes on the server at all.<br>
> <br>
> We could have a copy of the repo that is bare that is for the repo<br>
> serving and another copy that is for the web server that has master<br>
> checked out. Now we are using git we should make more use of branches<br>
> for changes and merges to apply the change to master.<br>
> <br>
> If you do leave uncommitted changes kicking around on the server you<br>
> will get this<br>
> <br>
> To ssh://<a href="http://expo.survex.com/~/troggle" rel="noreferrer" target="_blank">expo.survex.com/~/troggle</a><br>
> ! [remote rejected] master -> master (Working directory has unstaged<br>
> changes)<br>
> <br>
> Sam<br>
> <br>
> On 02/07/2019 00:25, Philip Sargent (Gmail) wrote:<br>
> > No, I have hit a brick wall.<br>
> > I can't get gitkraken to do anything other than pull, and I can't work<br>
> > out how to make it clone cavedrawings/ either.<br>
> > It does pull troggle/ though.<br>
> > I'll have to bring it to the pub tomorrow evening (is there WiFi at the<br>
> > ElmTree?) and get a git expert to help me through it.<br>
> ><br>
> > On Mon, 1 Jul 2019 at 23:58, Philip Sargent (Gmail)<br>
> > <<a href="mailto:philip.sargent@gmail.com" target="_blank">philip.sargent@gmail.com</a> <mailto:<a href="mailto:philip.sargent@gmail.com" target="_blank">philip.sargent@gmail.com</a>>> wrote:<br>
> ><br>
> > I am now having some success using gitkraken (free version, GUI for<br>
> > git working on xubuntu/xfce) [Search domain <a href="http://www.gitkraken.com" rel="noreferrer" target="_blank">www.gitkraken.com</a>]<br>
> > <<a href="https://duckduckgo.com/?q=gitkraken+site:www.gitkraken.com&t=" rel="noreferrer" target="_blank">https://duckduckgo.com/?q=gitkraken+site:www.gitkraken.com&t=</a><br>
> canonical&atb=v129-1><a href="https://www.gitkraken.com" rel="noreferrer" target="_blank">https://www.gitkraken.com</a><br>
> ><br>
> > <<a href="https://www.gitkraken.com/" rel="noreferrer" target="_blank">https://www.gitkraken.com/</a>><br>
> ><br>
> > which has a nice visual display of the merge tree<br>
> > <<a href="https://www.gitkraken.com/" rel="noreferrer" target="_blank">https://www.gitkraken.com/</a>> but it does require this form of the<br>
> url:<br>
> ><br>
> > ssh://<a href="http://expo@expo.survex.com/home/expo/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/home/expo/troggle</a><br>
> > <mailto:<a href="mailto:ssh" target="_blank">ssh</a>://<a href="http://expo@expo.survex.com/home/expo/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/home/expo/troggle</a>><br>
> ><br>
> > not the form with the /~/<br>
> ><br>
> > As a beginner git user, I am struggling. I can pull but not push (a<br>
> > minor text change to README.txt) as "the branch is checked out"<br>
> ><br>
> ><br>
> > On 28/06/2019 18:49, Wookey wrote:<br>
> >> On 2019-06-28 16:17 +0100, Sam Wenham wrote:<br>
> >>> I had a chat with our master of git. To clone from the server via<br>
> ssh<br>
> >>> you need to do<br>
> >>><br>
> >>> git clone ssh://<a href="http://expo@expo.survex.com/~/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/~/troggle</a> <mailto:<a href="mailto:ssh" target="_blank">ssh</a>://<br>
> <a href="http://expo@expo.survex.com/~/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/~/troggle</a>><br>
> >> Aha. obviously. I wonder why I've never come across that before.<br>
> >> Similarly:<br>
> >> git clone ssh://<a href="http://expo@expo.survex.com/home/expo/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/home/expo/troggle</a> <mailto:<a href="mailto:ssh" target="_blank">ssh</a>:/<br>
> /<a href="http://expo@expo.survex.com/home/expo/troggle" rel="noreferrer" target="_blank">expo@expo.survex.com/home/expo/troggle</a>><br>
> >> works<br>
> >><br>
> >><br>
> >> Wookey<br>
> >><br>
> >> _______________________________________________<br>
> >> Expo-tech mailing list<br>
> >> <a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a> <mailto:<a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a>><br>
> >> <a href="https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech" rel="noreferrer" target="_blank">https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech</a><br>
> ><br>
> ><br>
> > _______________________________________________<br>
> > Expo-tech mailing list<br>
> > <a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a><br>
> > <a href="https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech" rel="noreferrer" target="_blank">https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech</a><br>
> ><br>
> <br>
> _______________________________________________<br>
> Expo-tech mailing list<br>
> <a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a><br>
> <a href="https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech" rel="noreferrer" target="_blank">https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech</a><br>
> <br>
<br>
> _______________________________________________<br>
> Expo-tech mailing list<br>
> <a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a><br>
> <a href="https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech" rel="noreferrer" target="_blank">https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech</a><br>
<br>
Wookey<br>
-- <br>
Principal hats: Linaro, Debian, Wookware, ARM<br>
<a href="http://wookware.org/" rel="noreferrer" target="_blank">http://wookware.org/</a><br>
_______________________________________________<br>
Expo-tech mailing list<br>
<a href="mailto:Expo-tech@lists.wookware.org" target="_blank">Expo-tech@lists.wookware.org</a><br>
<a href="https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech" rel="noreferrer" target="_blank">https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech</a><br>
</blockquote></div>