From 9ff4e2dc440c7d10022250a2e6c2d45a8906cbb4 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 28 May 2020 08:03:36 +1000
Subject: [PATCH] Update commit-rebase.sh

Make it work when tree already has patches applied.
---
 staging/commit-rebase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/staging/commit-rebase.sh b/staging/commit-rebase.sh
index 93e44f1e..a1f21264 100755
--- a/staging/commit-rebase.sh
+++ b/staging/commit-rebase.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-sha=`git -C ./staging/wine/ rev-parse HEAD`
+sha=`git -C ./staging/wine/ rev-parse origin/master`
 echo $sha > ./staging/upstream-commit
 git commit -am "Rebase against $sha."