From 56a3cc3d04e50ca20b3e6d230eda3230f33bfcd4 Mon Sep 17 00:00:00 2001
From: Al Poole <netstar@gmail.com>
Date: Fri, 29 Dec 2017 11:53:26 +0000
Subject: [PATCH] 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. :/
---
 src/bin/edi_scm_ui.c |  2 +-
 src/lib/edi_scm.c    | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 27517e5..20b0032 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -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);
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index 2d56ea9..23868fe 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -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;