From 3b5a43e031014d5f9bbda965605f75eb6d74567d Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Tue, 9 Jun 2020 16:45:39 -0500
Subject: [PATCH] buildkite: Add some debug for looking into rebase issue

Add debug ls of .git dir to see at what point we have a
.git/rebase-merge dir around

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 .buildkite/hooks/pre-command | 3 +++
 .buildkite/pipeline.yml      | 2 ++
 .buildkite/run.sh            | 1 +
 3 files changed, 6 insertions(+)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 04ea9a06b01..281605d4948 100755
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -6,6 +6,8 @@
 # Save off where we started so we can go back there
 WORKDIR=${PWD}
 
+ls -lsa .git
+
 if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
    git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
    git checkout FETCH_HEAD
@@ -17,6 +19,7 @@ if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
        git merge --abort
        exit $merge_result
    }
+   ls -lsa .git
 fi
 
 mkdir -p /var/lib/buildkite-agent/zephyr-ccache/
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ffe699e514a..bfe0dd11b15 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,6 +1,8 @@
 steps:
   - command:
+    - ls -lsa .git
     - .buildkite/run.sh
+    - ls -lsa .git
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
       ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"
diff --git a/.buildkite/run.sh b/.buildkite/run.sh
index f47671e6ea5..2c8e15989af 100755
--- a/.buildkite/run.sh
+++ b/.buildkite/run.sh
@@ -21,6 +21,7 @@ echo ""
 echo "--- ccache stats at start"
 ccache -s
 
+ls -lsa .git
 if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
    ./scripts/ci/run_ci.sh  -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
 	   -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}