Skip to content

Commit 4b12b01

Browse files
authored
Tolerate deletion of release/start branches (#264)
Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
1 parent 5832325 commit 4b12b01

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ release_publish:
435435
git pull
436436
git tag -f $(VERSION)
437437
git push -f --tags
438-
git branch -D release_$(VERSION)
439-
git branch -D -r origin/release_$(VERSION)
438+
-git branch -D release_$(VERSION)
439+
-git branch -D -r origin/release_$(VERSION)
440440
rm -f branch.tmp
441441
@echo "Done: Triggered the publish workflow - now wait for it to finish and verify the publishing."
442442
@echo "Makefile: $@ done."
@@ -480,8 +480,8 @@ start_tag:
480480
git pull
481481
git tag -f $(VERSION)a0
482482
git push -f --tags
483-
git branch -D start_$(VERSION)
484-
git branch -D -r origin/start_$(VERSION)
483+
-git branch -D start_$(VERSION)
484+
-git branch -D -r origin/start_$(VERSION)
485485
rm -f branch.tmp
486486
@echo "Done: Pushed the release start tag and cleaned up the release start branch."
487487
@echo "Makefile: $@ done."

changes/noissue.58.fix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Development: Tolerate premature deletion of local release/start branches.

0 commit comments

Comments
 (0)