Fix minorr bugs

Commit deleted file when it was replaced in git
Fix commit functionality in tfs
Change git-branch to git-rev-parse because git-branch displays all remote branches

src/bll/remoterun/cvsproviderfactory.ts

@@ -24,7 +24,11 @@ export class CvsSupportProviderFactory {
         if (gitIsActive) {
             Logger.logDebug(`CvsSupportProviderFactory#getCvsSupportProvider: git is an activeCvs`);
             const gitProvider = new GitSupportProvider(gitCvsInfo.path);
-            await gitProvider.init();
+            try {
+                await gitProvider.init();
+            } catch (err) {
+                throw new Error("(teamcity) An error occurred during gitProvider initialisation");
+            }
             cvsProviders.push(gitProvider);
         }
 

src/dal/gitprovider.ts

@@ -264,7 +264,7 @@ export class GitSupportProvider implements CvsSupportProvider {
      * This method uses the "git branch -vv" command
      */
     private async getRemoteBrunch(): Promise<string> {
-        const getRemoteBranchCommand: string = `"${this._gitPath}" -C "${this._workspaceRootPath}" branch -vv --format='%(upstream:short)'`;
+        const getRemoteBranchCommand: string = `"${this._gitPath}" -C "${this._workspaceRootPath}" rev-parse --abbrev-ref --symbolic-full-name @{u}`;
         const prom = await cp_promise.exec(getRemoteBranchCommand);
         let remoteBranch: string = prom.stdout;
         if (remoteBranch === undefined || remoteBranch.length === 0) {
@@ -326,6 +326,9 @@ export class GitSupportProvider implements CvsSupportProvider {
         commitCommandBuilder.push(`"${this._gitPath}" -C "${this._workspaceRootPath}" commit -m "${this._checkInInfo.message}" --quiet --allow-empty-message`);
         this._checkInInfo.cvsLocalResources.forEach((cvsLocalResource) => {
             commitCommandBuilder.push(`"${cvsLocalResource.fileAbsPath}"`);
+            if (cvsLocalResource.prevFileAbsPath) {
+                commitCommandBuilder.push(`"${cvsLocalResource.prevFileAbsPath}"`);
+            }
         });
         return commitCommandBuilder.join(" ");
     }

src/dal/tfsprovider.ts

@@ -127,8 +127,8 @@ export class TfsSupportProvider implements CvsSupportProvider {
             const checkInCommandPrefix = `"${this._tfPath}" checkIn /comment:"${this._checkInInfo.message}" /noprompt `;
             const checkInCommandSB: string[] = [];
             checkInCommandSB.push(checkInCommandPrefix);
-            this._checkInInfo.cvsLocalResources.forEach((filePath) => {
-                checkInCommandSB.push(`"${filePath}" `);
+            this._checkInInfo.cvsLocalResources.forEach((localResource) => {
+                checkInCommandSB.push(`"${localResource.fileAbsPath}" `);
             });
             try {
                 await cp.exec(checkInCommandSB.join(""));