ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=e69cdf44d12750459360e44260ed9bbf32f02550
commit e69cdf44d12750459360e44260ed9bbf32f02550 Author: Andy Williams <[email protected]> Date: Tue Jun 6 18:11:45 2017 -0700 scm: add safety in code and in git branching We assume origin is the name of our remote in some places so must do so everywhere - otherwise we can overwrite the wrong remote --- src/bin/screens/edi_settings.c | 5 +++-- src/lib/edi_scm.c | 14 +------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c index 0220325..5c9d771 100644 --- a/src/bin/screens/edi_settings.c +++ b/src/bin/screens/edi_settings.c @@ -413,7 +413,7 @@ _edi_settings_project_name_cb(void *data EINA_UNUSED, Evas_Object *obj, static Evas_Object * _edi_settings_project_create(Evas_Object *parent) { - Edi_Scm_Engine *engine; + Edi_Scm_Engine *engine = NULL; Evas_Object *box, *frame, *hbox, *label, *entry_name, *entry_email; Evas_Object *entry_remote; Eina_Strbuf *text; @@ -491,7 +491,8 @@ _edi_settings_project_create(Evas_Object *parent) evas_object_show(label); entry_remote = elm_entry_add(hbox); - if (edi_scm_remote_enabled()) + elm_object_disabled_set(entry_remote, !engine); + if (engine) elm_object_text_set(entry_remote, engine->remote_url); evas_object_size_hint_weight_set(entry_remote, 0.75, 0.0); diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c index 655605b..e5ffd7e 100644 --- a/src/lib/edi_scm.c +++ b/src/lib/edi_scm.c @@ -268,25 +268,13 @@ _edi_scm_git_remote_email_get(void) static const char * _edi_scm_git_remote_url_get(void) { - char *remote; - Eina_Strbuf *command; Edi_Scm_Engine *engine = _edi_scm_global_object; if (!engine) return NULL; if (!engine->remote_url) - { - remote = _edi_scm_exec_response("git remote"); - if (remote) - { - command = eina_strbuf_new(); - eina_strbuf_append_printf(command, "git remote get-url %s", remote); - engine->remote_url = eina_stringshare_add(_edi_scm_exec_response(eina_strbuf_string_get(command))); - eina_strbuf_free(command); - free(remote); - } - } + engine->remote_url = eina_stringshare_add(_edi_scm_exec_response("git remote get-url origin")); return engine->remote_url; } --
