t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 014dabb0bf3647b9392d6087ebf6c40e1bc68108..8cc1e07fdb7204d13c99826304317c66d4249cf5 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2570,7 +2570,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
                ret = lock_ref_for_update(refs, update, transaction,
                                          head_ref, &affected_refnames, err);
                if (ret)
-                       break;
+                       goto cleanup;
 
                if (update->flags & REF_DELETING &&
                    !(update->flags & REF_LOG_ONLY) &&