Hi Tom,
On 11/29/2018 12:28 AM, Tom Eastep wrote:
> 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
>
I have reverted that patch because it causes more issues then it solved!
> Simple 'git push --tags ...' commands succeeded:
>
Done -- Patch 2 should do that!
-Matt
--
Matt Darfeuille
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
