aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-13 16:25:43 +0100
committerLukas Larsson <[email protected]>2013-02-13 16:25:43 +0100
commit7505ceff94dddb325543e32f3b8471a608097dc9 (patch)
tree9453b92c4c8965881f78906e5d59837a009c15f1 /erts/emulator/beam
parent14254702c27e9010f65cab69cd2829b00012d7ff (diff)
parent3e95d5f8e4a348efbb8fb1036da3fa9368c75ae2 (diff)
downloadotp-7505ceff94dddb325543e32f3b8471a608097dc9.tar.gz
otp-7505ceff94dddb325543e32f3b8471a608097dc9.tar.bz2
otp-7505ceff94dddb325543e32f3b8471a608097dc9.zip
Merge branch 'lukas/erts/add_sha_to_shell_title/OTP-10838'
* lukas/erts/add_sha_to_shell_title/OTP-10838: Include git sha in prompt if available
Diffstat (limited to 'erts/emulator/beam')
-rwxr-xr-xerts/emulator/beam/erl_bif_info.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index a601e4fb39..8582a8954b 100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -69,7 +69,11 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE
" [no-c-stack-objects]"
#endif
#ifndef OTP_RELEASE
+#ifdef ERLANG_GIT_VERSION
+ " [source-" ERLANG_GIT_VERSION "]"
+#else
" [source]"
+#endif
#endif
#ifdef ARCH_64
#if HALFWORD_HEAP