Skip to content

Commit

Permalink
Merge pull request #7 from ForgeFlow/fix-gitlab-mr
Browse files Browse the repository at this point in the history
[FIX] Treat all references containing / as remote references
  • Loading branch information
PabloEForgeFlow authored Jun 25, 2024
2 parents 0d66992 + 582ca4e commit c7581d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion odoo_filter_addons/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def filter_repo(agg_path, rname, repo, modules):
for merge in repo["merges"]:
merge = merge.strip()
remote, ref = merge.split()
if ref.startswith("refs/"):
if "/" in ref:
commit = git("-C", rpath, "ls-remote", "--exit-code", remote, ref).strip().split()[0]
lines.append(f"{merge} {commit}")
elif len(ref) == 40:
Expand Down
2 changes: 1 addition & 1 deletion odoo_filter_addons/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.3.2"
__version__ = "1.3.3"

0 comments on commit c7581d6

Please sign in to comment.