Skip to content

Commit ec05bd1

Browse files
committed
try to set the origin before detecting pending chnages
1 parent c31d3a8 commit ec05bd1

File tree

1 file changed

+4
-11
lines changed
  • tools/test-proxy/Azure.Sdk.Tools.TestProxy/Store

1 file changed

+4
-11
lines changed

tools/test-proxy/Azure.Sdk.Tools.TestProxy/Store/GitStore.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public async Task Push(string pathToAssetsJson) {
9797
return;
9898
}
9999

100+
SetOrigin(config);
100101
var pendingChanges = DetectPendingChanges(config);
101102
var generatedTagName = config.TagPrefix;
102103

@@ -121,7 +122,6 @@ public async Task Push(string pathToAssetsJson) {
121122
{
122123
throw GenerateInvokeException(SHAResult);
123124
}
124-
SetOrigin(config);
125125

126126
GitHandler.Run($"tag {generatedTagName}", config);
127127
GitHandler.Run($"push origin {generatedTagName}", config);
@@ -173,6 +173,7 @@ public async Task Reset(string pathToAssetsJson)
173173
InitializeAssetsRepo(config);
174174
}
175175

176+
SetOrigin(config);
176177
var pendingChanges = DetectPendingChanges(config);
177178

178179
if (pendingChanges.Length > 0)
@@ -217,6 +218,8 @@ public async Task Reset(string pathToAssetsJson)
217218
await BreadCrumb.Update(config);
218219
}
219220
}
221+
222+
HideOrigin(config);
220223
}
221224

222225
/// <summary>
@@ -249,16 +252,6 @@ public string[] DetectPendingChanges(GitAssetsConfiguration config)
249252
{
250253
SetSafeDirectory(config);
251254

252-
var a = Environment.GetEnvironmentVariable(GIT_COMMIT_OWNER_ENV_VAR);
253-
var b = Environment.GetEnvironmentVariable(GIT_COMMIT_EMAIL_ENV_VAR);
254-
255-
var preface = "";
256-
if (null != a && null != b)
257-
{
258-
preface = $"-c user.name =\"{a}\" -c user.email=\"{b}\" ";
259-
}
260-
261-
var run = $"{preface}status --porcelain";
262255
if (!GitHandler.TryRun($"status --porcelain", config.AssetsRepoLocation.ToString(), out var diffResult))
263256
{
264257
throw GenerateInvokeException(diffResult);

0 commit comments

Comments
 (0)