diff --git a/code/__DEFINES/rust_g.dm b/code/__DEFINES/rust_g.dm index a905fd5186f..ccd5b92c79d 100644 --- a/code/__DEFINES/rust_g.dm +++ b/code/__DEFINES/rust_g.dm @@ -3,5 +3,8 @@ #define rustg_dmi_strip_metadata(fname) call(RUST_G, "dmi_strip_metadata")(fname) +#define rustg_git_revparse(rev) call(RUST_G, "rg_git_revparse")(rev) +#define rustg_git_commit_date(rev) call(RUST_G, "rg_git_commit_date")(rev) + #define rustg_log_write(fname, text) call(RUST_G, "log_write")(fname, text) /proc/rustg_log_close_all() return call(RUST_G, "log_close_all")() diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 46de2c5c923..7067dd2f4f3 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -12,20 +12,13 @@ commit = revinfo.commit originmastercommit = revinfo.origin_commit else - var/list/logs = world.file2list(".git/logs/HEAD") - if(logs.len) - logs = splittext(logs[logs.len - 1], " ") - date = unix2date(text2num(logs[5])) - commit = logs[2] + commit = rustg_git_revparse("HEAD") + if(commit) + date = rustg_git_commit_date(commit) log_world("[commit]: [date]") else log_world("Unable to read git logs, revision information not available") - originmastercommit = commit = "Unknown" - date = unix2date(world.timeofday) - return - logs = world.file2list(".git/logs/refs/remotes/origin/master") - if(logs.len) - originmastercommit = splittext(logs[logs.len - 1], " ")[2] + originmastercommit = rustg_git_rev_parse("origin/master") if(testmerge.len) log_world(commit)