Update batch_job.py (#276)

fix(BatchMergeRequest): fixed a bug which prevented marge batch merging with fast forward commits
smarkets · Nov 1, 2020 · 5479a99 · 5479a99
1 parent 8fc2623
commit 5479a99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/marge/batch_job.py b/marge/batch_job.py
@@ -262,7 +262,7 @@ def execute(self):
                         local=True,
                     )
                     # Update <batch> branch with MR changes
-                    self._repo.fast_forward(
+                    batch_mr_sha = self._repo.fast_forward(
                         BatchMergeJob.BATCH_BRANCH_NAME,
                         merge_request.source_branch,
                         local=True,