Skip to content

Commit 9061450

Browse files
authored
Removed unused code (#148)
* Removed unused code * Update makemigrations.py
1 parent 1a1a9e3 commit 9061450

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

migration_fixer/management/commands/makemigrations.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,37 +112,36 @@ def handle(self, *app_labels, **options):
112112
)
113113
)
114114

115-
default_branch_commit = self.repo.commit(self.default_branch)
116-
117-
current_commit = self.repo.head.commit
118-
119115
if not self.skip_default_branch_update:
120116
if self.verbosity >= 2:
121117
self.stdout.write(
122118
f"Fetching git remote {self.remote} changes on: {self.default_branch}"
123119
)
124120

125-
if current_commit == default_branch_commit: # pragma: no cover
121+
try:
126122
remote = self.repo.remotes[self.remote]
127-
remote.pull(
128-
self.default_branch,
123+
remote.fetch(
124+
f"{self.default_branch}:{self.default_branch}",
129125
force=self.force_update,
130126
)
131-
else:
127+
except GitCommandError: # pragma: no cover
132128
try:
133129
remote = self.repo.remotes[self.remote]
134-
remote.fetch(
135-
f"{self.default_branch}:{self.default_branch}",
130+
remote.pull(
131+
self.default_branch,
136132
force=self.force_update,
137133
)
138-
except GitCommandError as e: # pragma: no cover
134+
except GitCommandError as e:
139135
raise CommandError(
140136
self.style.ERROR(
141-
f"Unable to fetch {self.remote} branch "
137+
f"Unable to retrieve changes from {self.remote} branch "
142138
f"'{self.default_branch}': {e.stderr}",
143139
),
144140
)
145141

142+
default_branch_commit = self.repo.commit(self.default_branch)
143+
current_commit = self.repo.head.commit
144+
146145
if self.verbosity >= 2:
147146
self.stdout.write(
148147
f"Retrieving the last commit sha on: {self.default_branch}"

0 commit comments

Comments
 (0)