Skip to content

Commit

Permalink
Emergency fix for sqSCCSVersion.h mis-edit by .git_filters/RevDateURL…
Browse files Browse the repository at this point in the history 
….smudge and

a putative fix to .git_filters/RevDateURL.smudge (add | head -n 1 to output).
  • Loading branch information
@eliotmiranda
eliotmiranda committed Jun 21, 2016
1 parent 7c1614a commit 3e19ff3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .git_filters/RevDateURL.smudge
View file
Expand Up @@ -18,7 +18,7 @@ if ( $branch eq "Cog" || $branch eq "dev" || $branch eq "master" || $branch eq "
}

if ((defined $ENV{'TRAVIS'}) || (defined $ENV{'APPVEYOR'})) {
$url=`git config --get remote.origin.url`;
$url=`git config --get remote.origin.url | head -n 1`;

This comment has been minimized.

Sign in to view

Copy link
@krono

krono Jun 21, 2016

Member

Thats no really necessary.
git config --get always ever reports one URL.
The output in sqSCCSVerison bleow is from the version of this script that included grep -i fetch

This comment has been minimized.

Sign in to view

Copy link
@eliotmiranda

eliotmiranda via email Jun 21, 2016

Author Contributor

This comment has been minimized.

Sign in to view

Copy link
@timfel

timfel Jun 22, 2016

Member

I will investigate why the output was wrong. The bug why it was committed is in the clean script - it assumes that $URL: .. $ and the other replacements will only ever be one-liners. Since the smudge script made a 3-line string, the clean script didn't remove it. I'll try to fix. Other than that, the emergency fix should be fine, I guess, in any case it shouldn't cause problems.

This comment has been minimized.

Sign in to view

Copy link
@eliotmiranda

eliotmiranda via email Jun 22, 2016

Author Contributor
} else {
$url=`whoami` . '@' . `hostname` . ':' . `PWD=\$(pwd) echo \${PWD##\$HOME/}`;
}
Expand Down
8 changes: 2 additions & 6 deletions platforms/Cross/vm/sqSCCSVersion.h
View file
Expand Up @@ -30,9 +30,7 @@ static char SvnRawRevisionString[] = "$Rev$";
static char SvnRawRevisionDate[] = "$Date$";
# define DATE_START (SvnRawRevisionDate + 7)

static char SvnRawRepositoryURL[] = "$URL: http://github.com/OpenSmalltalk/vm
SetWindowLongPtr_64bit_compatibility new (next fetch will store in remotes/origin)
tim/deployment-fixes new (next fetch will store in remotes/origin) $";
static char SvnRawRepositoryURL[] = "$URL$";
# define URL_START (SvnRawRepositoryURL + 6)

static char *
Expand Down Expand Up @@ -70,9 +68,7 @@ static char GitRawRevisionString[] = "$Rev$";
static char GitRawRevisionDate[] = "$Date$";
# define DATE_START (GitRawRevisionDate + 7)

static char GitRawRepositoryURL[] = "$URL: http://github.com/OpenSmalltalk/vm
SetWindowLongPtr_64bit_compatibility new (next fetch will store in remotes/origin)
tim/deployment-fixes new (next fetch will store in remotes/origin) $";
static char GitRawRepositoryURL[] = "$URL$";
# define URL_START (GitRawRepositoryURL + 6)

static char *
Expand Down

0 comments on commit 3e19ff3

Please sign in to comment.