[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 d1414e488f65d0819f313149ee559d9cdbd3c682..5bd5e78f8451521a32a708616be9ffe5114b382b 100755 (executable)
--- 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