From e37e0e3a72f1722f183ab552622151a9db51ac40 Mon Sep 17 00:00:00 2001
From: Dustin Pianalto <dustin@djpianalto.com>
Date: Sun, 20 May 2018 12:03:30 -0800
Subject: [PATCH] Modified git to use correct utils

---
 src/cogs/git.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/cogs/git.py b/src/cogs/git.py
index dc4e82f..901bbd2 100644
--- a/src/cogs/git.py
+++ b/src/cogs/git.py
@@ -30,7 +30,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import discord
 from discord.ext import commands
 import logging
-from .imports.utils import paginate, run_command
+from ..shared_libs.utils import paginate, run_command
 import asyncio
 
 git_log = logging.getLogger('git')
@@ -53,16 +53,19 @@ class Git:
                                title=f'Git Pull',
                                color=self.bot.embed_color)
             em.set_thumbnail(url=f'{ctx.guild.me.avatar_url}')
-            result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git fetch --all')), 120) + '\n'
-            result += await asyncio.wait_for(self.bot.loop.create_task(run_command('git reset --hard '
-                                                                                   'origin/$(git '
-                                                                                   'rev-parse --symbolic-full-name '
-                                                                                   '--abbrev-ref HEAD)')), 120) + '\n\n'
-            result += await asyncio.wait_for(self.bot.loop.create_task(run_command('git show --stat | '
-                                                                                   'sed "s/.*@.*[.].*/ /g"')), 10)
+
+            result = await asyncio.wait_for(self.bot.loop.create_task(
+                run_command('git fetch --all')), 120) + '\n'
+            result += await asyncio.wait_for(self.bot.loop.create_task(
+                run_command('git reset --hard origin/$(git rev-parse '
+                            '--symbolic-full-name --abbrev-ref HEAD)')),
+                120) + '\n\n'
+            result += await asyncio.wait_for(self.bot.loop.create_task(
+                run_command('git show --stat | sed "s/.*@.*[.].*/ /g"')), 10)
+
             results = paginate(result, maxlen=1014)
             for page in results[:5]:
-                em.add_field(name='￲', value=f'{page}')
+                em.add_field(name='\uFFF0', value=f'{page}')
         await ctx.send(embed=em)
 
     @git.command()
@@ -72,12 +75,13 @@ class Git:
                            title=f'Git Pull',
                            color=self.bot.embed_color)
         em.set_thumbnail(url=f'{ctx.guild.me.avatar_url}')
-        result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git status')), 10)
+        result = await asyncio.wait_for(self.bot.loop.create_task(
+            run_command('git status')), 10)
         results = paginate(result, maxlen=1014)
         for page in results[:5]:
-            em.add_field(name='￲', value=f'{page}')
+            em.add_field(name='\uFFF0', value=f'{page}')
         await ctx.send(embed=em)
 
 
 def setup(bot):
-    bot.add_cog(Git(bot))
\ No newline at end of file
+    bot.add_cog(Git(bot))