On 11/23/18 2:14 PM, Tom Eastep wrote: > On 11/23/18 4:06 AM, Matt Darfeuille wrote: >> Hi Tom, >> >> Given the issue you are facing with the release script I'm posting a >> follow-on patch. The patch aims to address the following error: >> >> "matt@debianvm01:~/shorewall/tools/build$ ./release 5.3.0.6 >> <snip> >> Pushing checked out branch from /home/matt/shorewall/trunk/.git to >> origin... >> >> fatal: The current branch 5.3.0 has no upstream branch. To push the >> current branch and set the remote as upstream, use >> >> git push --set-upstream origin 5.3.0 >> >> ERROR: Failed to push checked out branch from >> /home/matt/shorewall/trunk/.git to origin. >> matt@debianvm01:~/shorewall/tools/build$" >> >> >> The patch will in essence set the upstream branch to the matching local >> branch. I won't have anytime to work on Shorewall for the next week, >> that's why I'm sending it now.! :) >> >> > Applied -- thanks, Matt! > Hi Matt,
Unfortunately, I encountered the same issue when I tried to release 5.2.1.2:
teastep@Asus:~/shorewall/build/5.2.1$ release 5.2.1.2
Checking if /home/teastep/shorewall/trunk/.git is clean...
Checking out branch 5.2.1 in /home/teastep/shorewall/trunk/.git...
Checking if /home/teastep/shorewall/release/.git is clean...
Checking out branch 5.2.1 in /home/teastep/shorewall/release/.git...
Checking if /home/teastep/shorewall/tools/.git is clean...
Checking out branch master in /home/teastep/shorewall/tools/.git...
Checking if /home/teastep/shorewall/web/.git is clean...
Checking out branch master in /home/teastep/shorewall/web/.git...
Creating tag 5.2.1.2 in /home/teastep/shorewall/trunk/.git...
Creating tag 5.2.1.2 in /home/teastep/shorewall/release/.git...
Pushing checked out branch (5.2.1) from /home/teastep/shorewall/trunk/.git to
origin...
fatal: The current branch 5.2.1 has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin 5.2.1
ERROR: Failed to push checked out branch from
/home/teastep/shorewall/trunk/.git to origin.
It appears that your latest patch is applied:
teastep@Asus:~/shorewall/build/5.2.1$ which release
/home/teastep/bin/release
teastep@Asus:~/shorewall/build/5.2.1$ ls -l /home/teastep/bin/release
lrwxrwxrwx 1 teastep teastep 43 Aug 1 2017 /home/teastep/bin/release ->
/home/teastep/shorewall/tools/build/release
teastep@Asus:~/shorewall/build/5.2.1$ fgrep upstream /home/teastep/bin/release
git --git-dir=${1}/.git --work-tree=$1 push --quiet --follow-tags
-set-upstream $2 $3
git --git-dir=${1}/.git --work-tree=$1 push --quiet --follow-tags
--set-upstream $2 $BASEVERSION
Simple 'git push --tags ...' commands succeeded:
teastep@Asus:~/shorewall/trunk$ git push --tags origin 5.2.1
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 2.00 KiB | 2.00 MiB/s, done.
Total 7 (delta 5), reused 0 (delta 0)
remote: Checking connectivity: 7, done.
remote: <Repository /git/p/shorewall/code.git> refresh queued.
To ssh://git.code.sf.net/p/shorewall/code
45f8d3102..8ed644a0e 5.2.1 -> 5.2.1
* [new tag] 5.2.1.2 -> 5.2.1.2
teastep@Asus:~/shorewall/trunk$ git push --tags Server 5.2.1
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 2.00 KiB | 2.00 MiB/s, done.
Total 7 (delta 5), reused 0 (delta 0)
To ssh://server.shorewall.net/home/teastep/shorewall/code
45f8d3102..8ed644a0e 5.2.1 -> 5.2.1
* [new tag] 5.2.1.2 -> 5.2.1.2
teastep@Asus:~/shorewall/trunk$ cd ../release
teastep@Asus:~/shorewall/release$ git push --tags origin 5.2.1
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 4 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 2.77 KiB | 2.77 MiB/s, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: Checking connectivity: 6, done.
remote: <Repository /git/p/shorewall/release.git> refresh queued.
To ssh://git.code.sf.net/p/shorewall/release
1608118..a6de637 5.2.1 -> 5.2.1
* [new tag] 5.2.1.2 -> 5.2.1.2
teastep@Asus:~/shorewall/release$ git push --tags Server 5.2.1
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 4 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 2.77 KiB | 2.77 MiB/s, done.
Total 6 (delta 4), reused 0 (delta 0)
To ssh://server.shorewall.net/home/teastep/shorewall/release/
1608118..a6de637 5.2.1 -> 5.2.1
* [new tag] 5.2.1.2 -> 5.2.1.2
teastep@Asus:~/shorewall/release$
-Tom
--
Tom Eastep \ Q: What do you get when you cross a mobster with
Shoreline, \ an international standard?
Washington, USA \ A: Someone who makes you an offer you can't
http://shorewall.org \ understand
\_______________________________________________
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel
