fix(git): Don't fetch if push has failed (#13997)

* fix(git): Don't fetch if push has failed * Fix coverage
renovatebot · Feb 4, 2022 · 99c30be · 99c30be
1 parent 2a013b3
commit 99c30be
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
@@ -815,9 +815,10 @@ export async function prepareCommit({
 export async function pushCommit({
   branchName,
   files,
-}: CommitFilesConfig): Promise<void> {
+}: CommitFilesConfig): Promise<boolean> {
   await syncGit();
   logger.debug(`Pushing branch ${branchName}`);
+  let result = false;
   try {
     const pushOptions: TaskOptions = {
       '--force-with-lease': null,
@@ -835,9 +836,11 @@ export async function pushCommit({
     delete pushRes.repo;
     logger.debug({ result: pushRes }, 'git push');
     incLimitedValue(Limit.Commits);
+    result = true;
   } catch (err) /* istanbul ignore next */ {
     handleCommitError(files, branchName, err);
   }
+  return result;
 }
 
 export async function fetchCommit({
@@ -862,11 +865,13 @@ export async function commitFiles(
   config: CommitFilesConfig
 ): Promise<CommitSha | null> {
   const commitResult = await prepareCommit(config);
-  if (!commitResult) {
-    return null;
+  if (commitResult) {
+    const pushResult = await pushCommit(config);
+    if (pushResult) {
+      return fetchCommit(config);
+    }
   }
-  await pushCommit(config);
-  return fetchCommit(config);
+  return null;
 }
 
 export function getUrl({