Fix issue so that Git Config user.name is set correctly (#1850)

rfennell · Apr 4, 2024 · fe5fbee · fe5fbee
1 parent f5aa349
commit fe5fbee
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV2/src/GitWikiFuntions.ts b/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV2/src/GitWikiFuntions.ts
@@ -101,8 +101,8 @@ export async function UpdateGitWikiFolder(
     localpath,
     user,
     password,
-    name,
-    email,
+    gitName,
+    gitEmail,
     targetFolder,
     message,
     sourceFolder,
@@ -158,8 +158,9 @@ export async function UpdateGitWikiFolder(
         logInfo(`Cloned ${repo} to ${localpath}`);
 
         await git.cwd(localpath);
-        await git.addConfig("user.name", name);
-        await git.addConfig("user.email", email);
+        logInfo(`Setting GitConfig Name:${gitName} Email:${gitEmail}`);
+        await git.addConfig("user.name", gitName);
+        await git.addConfig("user.email", gitEmail);
         logInfo(`Set GIT values in ${localpath}`);
 
         // move to the working folder

diff --git a/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV2/task/task.json b/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV2/task/task.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 2,
     "Minor": 14,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [],
   "minimumAgentVersion": "2.144.0",

diff --git a/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV3/src/GitWikiFuntions.ts b/Extensions/WikiUpdater/WikiFolderUpdaterTask/WikiFolderUpdaterTaskV3/src/GitWikiFuntions.ts
@@ -101,8 +101,8 @@ export async function UpdateGitWikiFolder(
     localpath,
     user,
     password,
-    name,
-    email,
+    gitName,
+    gitEmail,
     targetFolder,
     message,
     sourceFolder,
@@ -158,8 +158,9 @@ export async function UpdateGitWikiFolder(
         logInfo(`Cloned ${repo} to ${localpath}`);
 
         await git.cwd(localpath);
-        await git.addConfig("user.name", name);
-        await git.addConfig("user.email", email);
+        logInfo(`Setting GitConfig Name:${gitName} Email:${gitEmail}`);
+        await git.addConfig("user.name", gitName);
+        await git.addConfig("user.email", gitEmail);
         logInfo(`Set GIT values in ${localpath}`);
 
         // move to the working folder

diff --git a/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV2/src/GitWikiFuntions.ts b/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV2/src/GitWikiFuntions.ts
@@ -100,8 +100,8 @@ export async function UpdateGitWikiFile(
     localpath,
     user,
     password,
-    name,
-    email,
+    gitName,
+    gitEmail,
     filename,
     message,
     contents,
@@ -156,8 +156,9 @@ export async function UpdateGitWikiFile(
         logInfo(`Cloned ${repo} to ${localpath}`);
 
         await git.cwd(localpath);
-        await git.addConfig("user.name", name);
-        await git.addConfig("user.email", email);
+        logInfo(`Setting GitConfig Name:${gitName} Email:${gitEmail}`);
+        await git.addConfig("user.name", gitName);
+        await git.addConfig("user.email", gitEmail);
         logInfo(`Set GIT values in ${localpath}`);
 
         // issue 969 - remove spaces

diff --git a/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV2/task/task.json b/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV2/task/task.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 2,
     "Minor": 14,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [],
   "minimumAgentVersion": "1.82.0",

diff --git a/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV3/src/GitWikiFuntions.ts b/Extensions/WikiUpdater/WikiUpdaterTask/WikiUpdaterTaskV3/src/GitWikiFuntions.ts
@@ -99,8 +99,8 @@ export async function UpdateGitWikiFile(
     localpath,
     user,
     password,
-    name,
-    email,
+    gitName,
+    gitEmail,
     filename,
     message,
     contents,
@@ -169,8 +169,9 @@ export async function UpdateGitWikiFile(
         logInfo(`Cloned ${repo} to ${localpath}`);
 
         await git.cwd(localpath);
-        await git.addConfig("user.name", name);
-        await git.addConfig("user.email", email);
+        logInfo(`Setting GitConfig Name:${gitName} Email:${gitEmail}`);
+        await git.addConfig("user.name", gitName);
+        await git.addConfig("user.email", gitEmail);
         logInfo(`Set GIT values in ${localpath}`);
 
         // issue 969 - remove spaces