From: Andreas Beckmann <anbe@debian.org>
Date: Wed, 1 Dec 2021 18:39:05 +0000 (+0100)
Subject: [PATCH 107/144] check for .git/rebase-merge to detect ongoing git rebase
X-Git-Tag: archive/raspbian/1.8-3+rpi1^2~38
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ca534c7ea09fc8cee5a8b4c8c5133ae17a962663;p=pocl.git

[PATCH 107/144] check for .git/rebase-merge to detect ongoing git rebase

.git/ORIG_HEAD may be a stale file

Gbp-Pq: Name 0107-check-for-.git-rebase-merge-to-detect-ongoing-git-re.patch
---

diff --git a/tools/scripts/format-last-commit.sh b/tools/scripts/format-last-commit.sh
index d1414e4..5bd5e78 100755
--- a/tools/scripts/format-last-commit.sh
+++ b/tools/scripts/format-last-commit.sh
@@ -28,7 +28,7 @@ if [ "$REPLY" == "y" ]; then
 
   git commit --amend
 
-  if [ -e .git/ORIG_HEAD ]; then
+  if [ -d .git/rebase-merge ]; then
 
     git rebase --continue