vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edi_scm: Consistent results for SCM root_directory. 

Sorry about this sin of ommission. Also let's not
unnecessarily call method for which value already
exists. :/
This commit is contained in:
Al Poole 2017-12-29 11:53:26 +00:00
parent 3ceea8eb1e
commit 56a3cc3d04
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/edi_scm_ui.c
View File

@ -715,7 +715,7 @@ edi_scm_ui_add(Evas_Object *parent)
else
{
eina_strbuf_append_printf(string, "%s:<br><b>%s</b> &lt;%s&gt;", _("Author"),
engine->remote_name_get(), engine->remote_email_get());
remote_name, remote_email);
_edi_scm_ui_screens_avatar_load(avatar, engine->remote_email_get());
_avatar_effect(avatar);

16
src/lib/edi_scm.c
View File

@ -796,6 +796,7 @@ static Edi_Scm_Engine *
_edi_scm_git_init()
{
Edi_Scm_Engine *engine;
char *current_directory = NULL;
if (!ecore_file_app_installed("git"))
return NULL;
@ -824,9 +825,18 @@ _edi_scm_git_init()
engine->status_get = _edi_scm_git_status_get;
if (edi_project_get())
engine->root_directory = strdup(edi_project_get());
else
engine->root_directory = _edi_scm_git_project_root_get();
{
current_directory = getcwd(NULL, PATH_MAX);
chdir(edi_project_get());
}
engine->root_directory = _edi_scm_git_project_root_get();
if (current_directory)
{
chdir(current_directory);
free(current_directory);
}
engine->initialized = EINA_TRUE;