Merge branch 'master' of github.com:wireapp/wire-webapp into rc/2025-10-8

Author: thisisamir98

bin/release_tag.ts

@@ -82,7 +82,9 @@ if (commitId) {
     // If we're releasing to production, we need to ensure the commitId is part of the master branch.
     const commitBranch = exec(`git branch --contains ${commitId}`)
       .split('\n')
-      .map(branch => branch.trim());
+      // the branch name will have a star in front if it's the current branch
+      .map(branch => branch.replace('* ', '').trim());
+    logger.info(`Commit ID "${commitId}" is part of branches: ${commitBranch}`);
     if (!commitBranch.includes(branch)) {
       logger.error(`Commit ID "${commitId}" is not part of the ${branch} branch. Aborting.`);
       process.exit(1);

src/script/repositories/backup/BackupRepository.ts

@@ -453,19 +453,16 @@ export class BackupRepository {
         message = 'The user id in the backup file header does not match the expected one';
         this.logger.error(message);
         throw new DifferentAccountError(message);
-        break;
       }
       case ERROR_TYPES.INVALID_FORMAT:
         message = 'The provided backup version is lower than the minimum supported version';
         this.logger.error(message);
         throw new IncompatibleBackupError(message);
-        break;
 
       case ERROR_TYPES.INVALID_VERSION:
         message = 'The provided backup version is lower than the minimum supported version';
         this.logger.error('The provided backup format is not supported');
         throw new IncompatibleBackupFormatError(message);
-        break;
     }
   }
 }