From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 31 Oct 2025 21:34:15 +0000 (+1100)
Subject: Support using git for OpenBSD src tree tests.
X-Git-Url: https://git.feebdaed.xyz/?a=commitdiff_plain;h=7e5d404cf73b6762715eec69b67cce2c4801f9e9;p=0xmirror%2Fopenssh-portable.git

Support using git for OpenBSD src tree tests.
---

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 6cb08fd41..d055627a8 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -42,7 +42,7 @@ jobs:
       run: sshfs_mount
       working-directory: ${{ runner.temp }}
     - name: update source
-      run: vmrun "cd /usr/src && cvs -q up -dPA usr.bin/ssh regress/usr.bin/ssh usr.bin/nc"
+      run: vmrun "cd /usr/src && if [ -d .git ]; then git pull &&  git log -n1 --pretty=format:"%h %an: %s" ; else cvs -q up -dPA usr.bin/ssh regress/usr.bin/ssh usr.bin/nc; fi"
     - name: update netcat
       run: vmrun "cd /usr/src/usr.bin/nc && make clean all && sudo make install"
     - name: make clean