Skip to content
Snippets Groups Projects
Commit 8eb99e5c authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

largefiles: don't process merge actions at all when overwriting

parent d51c4d85
Branches
Tags
No related merge requests found
......@@ -370,6 +370,10 @@
overwrite = force and not branchmerge
actions = origfn(repo, p1, p2, pa, branchmerge, force, partial,
acceptremote)
if overwrite:
return actions
processed = []
for action in actions:
......@@ -373,9 +377,6 @@
processed = []
for action in actions:
if overwrite:
processed.append(action)
continue
f, m, args, msg = action
splitstandin = lfutil.splitstandin(f)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment