Update checking if running on the current branch (#144)

* Update checking if running on the current branch

* Update makemigrations.py

Author: jackton1

migration_fixer/management/commands/makemigrations.py

@@ -104,8 +104,6 @@ def handle(self, *app_labels, **options):
                     if self.verbosity >= 2:
                         self.stdout.write("Retrieving the current branch...")
 
-                    current_branch = self.repo.active_branch.name
-
                     if self.repo.is_dirty():  # pragma: no cover
                         raise CommandError(
                             self.style.ERROR(
@@ -114,13 +112,17 @@ def handle(self, *app_labels, **options):
                             )
                         )
 
+                    default_branch_commit = self.repo.commit(self.default_branch)
+
+                    current_commit = self.repo.head.commit
+
                     if not self.skip_default_branch_update:
                         if self.verbosity >= 2:
                             self.stdout.write(
                                 f"Fetching git remote {self.remote} changes on: {self.default_branch}"
                             )
 
-                        if current_branch == self.default_branch:  # pragma: no cover
+                        if current_commit == default_branch_commit:  # pragma: no cover
                             remote = self.repo.remotes[self.remote]
                             remote.pull(
                                 self.default_branch,
@@ -146,10 +148,6 @@ def handle(self, *app_labels, **options):
                             f"Retrieving the last commit sha on: {self.default_branch}"
                         )
 
-                    default_branch_commit = self.repo.commit(self.default_branch)
-
-                    current_commit = self.repo.commit(current_branch)
-
                     # Load the current graph state. Pass in None for the connection so
                     # the loader doesn't try to resolve replaced migrations from DB.
                     loader = MigrationLoader(None, ignore_no_migrations=True)