Skip to content

Commit 07c7f82

Browse files
committed
Version info: Rename GitHash to CommitHash
1 parent 5a5b1c7 commit 07c7f82

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.git_filters/RevDateURL.clean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
s/\$Date[^\$]*\$/\$Date\$/;
44
s/\$Rev[^\$]*\$/\$Rev\$/;
55
s/\$URL[^\$]*\$/\$URL\$/;
6-
s/\$Hash[^\$]*\$/\$Hash\$/;
6+
s/\$CommitHash[^\$]*\$/\$CommitHash\$/;

.git_filters/RevDateURL.smudge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ while (<STDIN>) {
3434
s/\$Date[^\$]*\$/\$Date: $date \$/;
3535
s/\$URL[^\$]*\$/\$URL: $url \$/;
3636
s/\$Rev[^\$]*\$/\$Rev: $myrev \$/;
37-
s/\$Hash[^\$]*\$/\$Hash: $shorthash \$/;
37+
s/\$CommitHash[^\$]*\$/\$CommitHash: $shorthash \$/;
3838
} continue {
3939
print or die "-p destination: $!\n";
4040
}

platforms/Cross/vm/sqSCCSVersion.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ static char SvnRawRevisionDate[] = "$Date$";
3737
static char SvnRawRepositoryURL[] = "$URL$";
3838
# define URL_START (SvnRawRepositoryURL + 6)
3939

40-
static char SvnRawRevisionShortHash[] = "$Hash$";
41-
# define SHORTHASH_START (SvnRawRevisionShortHash + 7)
40+
static char SvnRawRevisionShortHash[] = "$CommitHash$";
41+
# define SHORTHASH_START (SvnRawRevisionShortHash + 13)
4242

4343
static char *
4444
revisionAsString()
@@ -86,8 +86,8 @@ static char GitRawRevisionDate[] = "$Date$";
8686
static char GitRawRepositoryURL[] = "$URL$";
8787
# define URL_START (GitRawRepositoryURL + 6)
8888

89-
static char SvnRawRevisionShortHash[] = "$Hash$";
90-
# define SHORTHASH_START (SvnRawRevisionShortHash + 7)
89+
static char SvnRawRevisionShortHash[] = "$CommitHash$";
90+
# define SHORTHASH_START (SvnRawRevisionShortHash + 13)
9191

9292
static char *
9393
revisionAsString()
@@ -144,7 +144,7 @@ sourceVersionString(char separator)
144144
{
145145
if (!sourceVersion) {
146146
#if 1 /* a) mingw32 doesn't have asprintf and b) on Mac OS it segfaults. */
147-
char *fmt = "VM: " PREFIX "%s %s%cDate: %s Hash: %s%cPlugins: " PREFIX "%s %s";
147+
char *fmt = "VM: " PREFIX "%s %s%cDate: %s CommitHash: %s%cPlugins: " PREFIX "%s %s";
148148
int len = strlen(fmt)
149149
+ strlen(revisionAsString())
150150
+ strlen(repositoryURL())
@@ -161,7 +161,7 @@ sourceVersionString(char separator)
161161
pluginsRevisionAsString(), pluginsRepositoryURL());
162162
#else
163163
asprintf(&sourceVersion,
164-
"VM: " PREFIX "%s %s%cDate: %s Hash: %s%cPlugins: " PREFIX "%s %s",
164+
"VM: " PREFIX "%s %s%cDate: %s CommitHash: %s%cPlugins: " PREFIX "%s %s",
165165
revisionAsString(), repositoryURL(),
166166
separator,
167167
revisionDateAsString(), revisionShortHash(),

0 commit comments

Comments
 (0)