From 8510ebe1aa442e24704bdfffebb55614797d80e0 Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Tue, 10 Apr 2018 09:52:10 -0500 Subject: [PATCH] better debugging, also fetch whole history for a merge --- images/oc-build-deploy-dind/scripts/git-checkout-pull-merge.sh | 3 ++- images/oc-build-deploy-dind/scripts/git-checkout-pull.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/oc-build-deploy-dind/scripts/git-checkout-pull-merge.sh b/images/oc-build-deploy-dind/scripts/git-checkout-pull-merge.sh index b7328f2602..076ab1bc9f 100755 --- a/images/oc-build-deploy-dind/scripts/git-checkout-pull-merge.sh +++ b/images/oc-build-deploy-dind/scripts/git-checkout-pull-merge.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x REMOTE=$1 PR_HEAD_SHA=$2 @@ -6,7 +7,7 @@ PR_BASE_SHA=$3 git init . git config remote.origin.url $REMOTE -git fetch --depth=10 --tags --progress $REMOTE +refs/heads/*:refs/remotes/origin/* +git fetch --tags --progress $REMOTE +refs/heads/*:refs/remotes/origin/* git checkout --force "${3}" git merge ${2} diff --git a/images/oc-build-deploy-dind/scripts/git-checkout-pull.sh b/images/oc-build-deploy-dind/scripts/git-checkout-pull.sh index f71cc531e0..27e223cbd5 100755 --- a/images/oc-build-deploy-dind/scripts/git-checkout-pull.sh +++ b/images/oc-build-deploy-dind/scripts/git-checkout-pull.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x # REF: can be a: # a sha: a7789dc5e6960bb2250ae39d7e7145b632c44c77