From e25d26bcab18c12ce87bf4bb96841ea7105be215 Mon Sep 17 00:00:00 2001
From: Simon Knott <info@simonknott.de>
Date: Thu, 6 Feb 2025 11:36:06 +0100
Subject: [PATCH] only record one of two

---
 .../src/plugins/gitCommitInfoPlugin.ts           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
index 7975177d88..1f518584b8 100644
--- a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
+++ b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
@@ -89,14 +89,6 @@ async function gitStatusFromCLI(gitDir: string, envInfo: Pick<GitCommitInfo, 'pu
     'revision.timestamp': timestamp,
   };
 
-  const diffResult = await spawnAsync(
-      'git',
-      ['diff', 'HEAD~1'],
-      { stdio: 'pipe', cwd: gitDir, timeout: GIT_OPERATIONS_TIMEOUT_MS }
-  );
-  if (!diffResult.code)
-    result['revision.diff'] = diffResult.stdout;
-
   if (envInfo['pull.base']) {
     const pullDiffResult = await spawnAsync(
         'git',
@@ -105,6 +97,14 @@ async function gitStatusFromCLI(gitDir: string, envInfo: Pick<GitCommitInfo, 'pu
     );
     if (!pullDiffResult.code)
       result['pull.diff'] = pullDiffResult.stdout;
+  } else {
+    const diffResult = await spawnAsync(
+        'git',
+        ['diff', 'HEAD~1'],
+        { stdio: 'pipe', cwd: gitDir, timeout: GIT_OPERATIONS_TIMEOUT_MS }
+    );
+    if (!diffResult.code)
+      result['revision.diff'] = diffResult.stdout;
   }
 
   return result;