amend mistake for 7ac2cddc

app/services/merge_requests/ff_merge_service.rb

@@ -15,15 +15,15 @@ module MergeRequests
                           source,
                           merge_request.target_branch,
                           merge_request: merge_request)
-      merge_request.update(in_progress_merge_commit_sha: nil)
+      if merge_request.squash
+        merge_request.update(squash_commit_sha: merge_request.in_progress_merge_commit_sha)
+      end
     rescue Gitlab::Git::PreReceiveError => e
       raise MergeError, e.message
     rescue StandardError => e
       raise MergeError, "Something went wrong during merge: #{e.message}"
     ensure
-      if merge_request.squash
-        merge_request.update(squash_commit_sha: merge_request.in_progress_merge_commit_sha)
-      end
+      merge_request.update(in_progress_merge_commit_sha: nil)
     end
   end
 end