Commit dd6d7df5 authored by Sujen's avatar Sujen
Browse files

Merge branch 'fix-upstream-check' into 'master'

Fix upstream check

See merge request !194
parents 15b53235 28cafc77
Pipeline #117100451 passed with stages
in 89 minutes and 3 seconds
......@@ -1044,7 +1044,7 @@ else:
if arguments.devel:
files_changed = filter_for_devel(files_changed)
if any(not os.path.relpath(file_path).startswith('v') for file_path in file_changed):
if any(not (file_path == '.gitattributes' or file_path.startswith('v')) for file_path in files_changed):
raise ValidationError("There are non-primitive file changes between your branch and upstream. If you have not authored those changes, you need to update your branch with upstream.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment