[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/file=5Fformats/yaml=3A=20Update=20dev-tools/sync-upstr?= =?UTF-8?Q?eam
From:       Bryan Davis <bd808 () php ! net>
Date:       2020-04-22 21:34:32
Message-ID: php-mail-af4c9fbcf349d4622904efc42f8cb41e671098013 () git ! php ! net
[Download RAW message or body]

Commit:    004f94f25f5f59259d73ce5eb2f33f3c3a2de7ee
Author:    Bryan Davis <bd808@bd808.com>         Wed, 22 Apr 2020 15:34:32 -0600
Parents:   ed962bf753a112ff3e002c2af727e90e0cbdedc5
Branches:  php7

Link:       http://git.php.net/?p=pecl/file_formats/yaml.git;a=commitdiff;h=004f94f25f5f59259d73ce5eb2f33f3c3a2de7ee


Log:
Update dev-tools/sync-upstream to target php7 branch

Changed paths:
  M  dev-tools/sync-upstream.sh


Diff:
diff --git a/dev-tools/sync-upstream.sh b/dev-tools/sync-upstream.sh
index 9a8443b..110e722 100755
--- a/dev-tools/sync-upstream.sh
+++ b/dev-tools/sync-upstream.sh
@@ -7,7 +7,7 @@ set -u
 
 UPSTREAM_URL="https://github.com/php/pecl-file_formats-yaml.git"
 UPSTREAM=upstream
-MASTER=master
+MASTER=php7
 
 MY_UPSTREAM=$(git remote show ${UPSTREAM} 2>/dev/null |
     grep "Fetch URL"|awk '{print $3}')
@@ -28,4 +28,4 @@ set -x
 
 git fetch ${UPSTREAM} -pv
 git checkout ${MASTER}
-git merge --ff-only ${UPSTREAM}/master
+git merge --ff-only ${UPSTREAM}/${MASTER}


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]