summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-06-16 09:58:35 -0700
committerAndrew Godwin <andrew@aeracode.org>2014-06-16 09:58:35 -0700
commit2b79be2beee8531ab1ef4efca75589705774d8f7 (patch)
tree0e84cc86b2806be7e91a27e6172a29356acaad52 /django/core
parentf047dd2f3eb15619c9137d3389b22e6914092f1c (diff)
Fixed #22848: Ignore no-migrations errors during makemigrations only
Diffstat (limited to 'django/core')
-rw-r--r--django/core/management/commands/makemigrations.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py
index e172213176..9f20743869 100644
--- a/django/core/management/commands/makemigrations.py
+++ b/django/core/management/commands/makemigrations.py
@@ -49,7 +49,7 @@ class Command(BaseCommand):
# 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)
+ loader = MigrationLoader(None, ignore_no_migrations=True)
# Before anything else, see if there's conflicting apps and drop out
# hard if there are any and they don't want to merge