From b0c8a634f384d9a632ed0fc1b97549a26118fdb0 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Thu, 12 Oct 2023 23:24:11 +0200
Subject: [PATCH] check the status of the cascaded PR

---
 cascading-pr-lib.sh |  6 +++---
 cascading-pr.sh     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cascading-pr-lib.sh b/cascading-pr-lib.sh
index 82b634a..51b2f9f 100644
--- a/cascading-pr-lib.sh
+++ b/cascading-pr-lib.sh
@@ -93,7 +93,7 @@ function check_status() {
     local api="$1"
     local sha="$2"
     local expected_status="$3"
-    local expected_description="$3"
+    local expected_description="$4"
 
     get_status $api $sha > $TMPDIR/status.json
     local status="$(jq --raw-output .state < $TMPDIR/status.json)"
@@ -130,9 +130,9 @@ function wait_log() {
 }
 
 function wait_status() {
+    local status="$1"
     local api="$2"
     local sha="$3"
-    local status="$1"
     local description="$4"
 
     for i in $(seq $LOOPS); do
@@ -145,7 +145,7 @@ function wait_status() {
     if test $(check_status "$api" "$sha" "$status" "$description") = "OK" ; then
 	log_info "$sha status OK"
     else
-	get_status $url $repo $sha | jq .statuses
+	get_status $api $sha | jq .statuses
 	log_info "$sha status NOK"
 	return 1
     fi
diff --git a/cascading-pr.sh b/cascading-pr.sh
index 0609f73..b3d6ecd 100755
--- a/cascading-pr.sh
+++ b/cascading-pr.sh
@@ -77,14 +77,13 @@ function push() {
 
     (
 	cd $TMPDIR/$direction
-	if git diff; then
-	    log_info "nothing to push"
-	else
-	    git add .
-	    git commit -m 'cascading-pr update'
-	    git push --force-push origin $branch
+	git add .
+	if git commit -m 'cascading-pr update'; then
+	    git push --force origin $branch
 	    git rev-parse HEAD > ../$direction.sha
 	    log_info "pushed"
+	else
+	    log_info "nothing to push"
 	fi
     )
 }
@@ -100,19 +99,20 @@ function update() {
     upsert_clone destination ${options[destination_head]} ${options[destination_clone]}
     (
 	cd $TMPDIR/origin
+	ls -l  $TMPDIR/destination
 	${options[update]} $TMPDIR/destination
     )
-    push destination ${options[destination_clone]}
+    push destination ${options[destination_head]} ${options[destination_clone]}
 }
 
 function finalize_options() {
     options[origin_scheme]=$(scheme ${options[origin_url]})
     options[origin_host_port]=$(host_port ${options[origin_url]})
-    options[origin_clone]=${options[origin_scheme]}://:${options[origin_token]}@${options[origin_host_port]}/${options[origin_repo]}
+    options[origin_clone]=${options[origin_scheme]}://any:${options[origin_token]}@${options[origin_host_port]}/${options[origin_repo]}
     options[origin_head]=$(origin_pr_head)
     options[destination_scheme]=$(scheme ${options[destination_url]})
     options[destination_host_port]=$(host_port ${options[destination_url]})
-    options[destination_clone]=${options[destination_scheme]}://:${options[destination_token]}@${options[destination_host_port]}/${options[destination_repo]}
+    options[destination_clone]=${options[destination_scheme]}://any:${options[destination_token]}@${options[destination_host_port]}/${options[destination_repo]}
     options[destination_base]=${options[destination_branch]}
     : ${options[prefix]:=${options[origin_repo]}}
     options[destination_head]=${options[prefix]}-${options[origin_pr]}