[gjs: 2/4] CI: Fix bug in common ancestor script




commit b909f8fb33f7ba156885bf94cf7a25616274583c
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jul 24 22:24:19 2022 -0700

    CI: Fix bug in common ancestor script
    
    We need to bail out if the upstream base _commit_ is already found, not
    the upstream base _branch_.

 test/test-ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/test/test-ci.sh b/test/test-ci.sh
index b6d738f77..da8956667 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -25,7 +25,7 @@ do_Get_Upstream_Base () {
     echo '-----------------------------------------'
     echo 'Finding common ancestor'
 
-    if git show-branch ci-upstream-base-branch 2> /dev/null; then
+    if git show-branch ci-upstream-base 2> /dev/null; then
         echo "Already found"
         return
     fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]