<div dir="ltr">Hi Tobias,<div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 21, 2016 at 2:54 PM, Tobias Pape <span dir="ltr"><<a href="mailto:Das.Linux@gmx.de" target="_blank">Das.Linux@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
On 21.06.2016, at 23:37, Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>> wrote:<br>
<br>
> Hi Tobias,<br>
><br>
> On Tue, Jun 21, 2016 at 1:37 PM, Tobias Pape <<a href="mailto:Das.Linux@gmx.de">Das.Linux@gmx.de</a>> wrote:<br>
><br>
> Hi Eliot,<br>
><br>
> On 21.06.2016, at 22:08, Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>> wrote:<br>
><br>
> > Hi All,<br>
> ><br>
> > recent changes, I *think* to updateSCCSVersions, have broken platforms/Cross/vm/sqSCCSVersion.h:<br>
> ><br>
> > static char SvnRawRepositoryURL[] = "$URL: <a href="http://github.com/OpenSmalltalk/vm" rel="noreferrer" target="_blank">http://github.com/OpenSmalltalk/vm</a><br>
> > SetWindowLongPtr_64bit_compatibility new (next fetch will store in remotes/origin)<br>
> > tim/deployment-fixes new (next fetch will store in remotes/origin) $";<br>
><br>
> This is due to the line you added in .git_filters/RevDateURL.smudge:<br>
><br>
><br>
> if (!$url) { $url=`git remote show origin | grep -i fetch | sed 's/^.*URL: //' 2>/dev/null` }<br>
><br>
> Problem being, the two lines match 'fetch' (next _fetch_ will store in ...), so you get more than the actual URL.<br>
><br>
> However, this has been fixed already, the current version from 24198c6<br>
> (see <a href="https://github.com/OpenSmalltalk/vm/commits/Cog/.git_filters/RevDateURL.smudge" rel="noreferrer" target="_blank">https://github.com/OpenSmalltalk/vm/commits/Cog/.git_filters/RevDateURL.smudge</a>) has changed<br>
> and does not suffer from the grep. Relevant lines:<br>
><br>
><br>
> if ((defined $ENV{'TRAVIS'}) || (defined $ENV{'APPVEYOR'})) {<br>
> $url=`git config --get remote.origin.url`;<br>
> } else {<br>
> $url=`whoami` . '@' . `hostname` . ':' . `PWD=\$(pwd) echo \${PWD##\$HOME/}`;<br>
> }<br>
><br>
> Thanks. So it was me :-(. Good to know.<br>
><br>
> Is your repo up to date?<br>
><br>
> How do I know? This "fetch and then diff" method is IMO broken. I simply want to know whether there are incoming commits /before/ I do a fetch.<br>
<br>
</span>Fetch means 'get what is on the server to me but no more'<br>
<br>
I have a personal alias to see incoming changes:<br>
<br>
git config --global alias.incoming '!git remote update -p; git log ..@{u}'<br>
<br>
I can then do `git incoming` and it fetches the changes but then only shows<br>
the changes. So, after a fetch you can do<br>
<br>
git log ..@{u}<br>
<br>
which means 'please show me all changes from here to what upstream has'<br></blockquote><div><br></div><div>Ah, this looks like it could be what I want. So where should one put the git config command? Run it once in one's .profile? Add it to some configuration file?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">HTH<br>
best<br>
<span class="HOEnZb"><font color="#888888"> -Tobias<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
> Best regards<br>
> -Tobias<br>
><br>
> ><br>
> > First, multi-liner string constants must be terminated with a backslash to compile. So at the very least we'd need<br>
> ><br>
> > static char SvnRawRepositoryURL[] = "$URL: <a href="http://github.com/OpenSmalltalk/vm\" rel="noreferrer" target="_blank">http://github.com/OpenSmalltalk/vm\</a><br>
> > SetWindowLongPtr_64bit_compatibility new (next fetch will store in remotes/origin)\<br>
> > tim/deployment-fixes new (next fetch will store in remotes/origin) $";<br>
> ><br>
> > But second, multi-line output doesn't make sense here. We need something that fits on a single line. Who is going to fix this? I have a production build which is broken because of this.<br>
> ><br>
> > _,,,^..^,,,_<br>
> > best, Eliot<br>
<br>
<br>
<br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><span style="font-size:small;border-collapse:separate"><div>_,,,^..^,,,_<br></div><div>best, Eliot</div></span></div></div></div>
</div></div>