Merge pull request #339 from amazeeio/hotfix/git-merge-history

better debugging, also fetch whole history for a merge
uselagoon · Apr 10, 2018 · c98853f · c98853f
2 parents d9981a6 + 8510ebe
commit c98853f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -1,12 +1,13 @@
 #!/bin/bash
+set -x
 
 REMOTE=$1
 PR_HEAD_SHA=$2
 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
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 # REF: can be a:
 # a sha: a7789dc5e6960bb2250ae39d7e7145b632c44c77