diff options
| author | Streusel <advance_me@hotmail.de> | 2013-02-16 03:13:44 -0800 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-02-16 03:13:44 -0800 |
| commit | fb8352aca63a5e5641df67be49a5c907f434d28e (patch) | |
| tree | f9a994d84cec09bd808dd9f5872f80d6683eb9e9 | |
| parent | 003ed2ccc435a3d5ebf2d86f1e94367102aafb20 (diff) | |
| parent | 484c1b6ac438e58c66f5ff16b09e2cf07c8e1981 (diff) | |
| download | hercules-fb8352aca63a5e5641df67be49a5c907f434d28e.tar.gz hercules-fb8352aca63a5e5641df67be49a5c907f434d28e.tar.bz2 hercules-fb8352aca63a5e5641df67be49a5c907f434d28e.tar.xz hercules-fb8352aca63a5e5641df67be49a5c907f434d28e.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
| -rw-r--r-- | src/common/core.c | 4 | ||||
| -rw-r--r-- | src/common/core.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/common/core.c b/src/common/core.c index d1a374b29..73416497d 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -259,7 +259,7 @@ const char* get_svn_revision(void) } #endif /* whats our origin */ -#define GIT_ORIGIN "master" +#define GIT_ORIGIN "refs/remotes/origin/master" /* Grabs the hash from the last time the user updated his working copy (last pull) */ const char *get_git_hash (void) { static char HerculesGitHash[41] = "";//Sha(40) + 1 @@ -268,7 +268,7 @@ const char *get_git_hash (void) { if( HerculesGitHash[0] != '\0' ) return HerculesGitHash; - if ( (fp = fopen (".git/refs/remotes/origin/"GIT_ORIGIN, "r")) != NULL) { + if ( (fp = fopen (".git/"GIT_ORIGIN, "r")) != NULL) { char line[64]; char *rev = malloc (sizeof (char) * 50); diff --git a/src/common/core.h b/src/common/core.h index 8007e6036..dc4db6004 100644 --- a/src/common/core.h +++ b/src/common/core.h @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules dev team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #ifndef _CORE_H_ #define _CORE_H_ |