Attached Files | 0001-CHANGELOG-Fix-an-URL-to-the-Git-master-branch.patch [^] (4,593 bytes) 2022-01-18 17:12 [Show Content] [Hide Content]From f22e3e2ad9583fcfe8530dedf599c0352d18fc5d Mon Sep 17 00:00:00 2001
From: Linda Lapinlampi <linda@lindalap.fi>
Date: Tue, 18 Jan 2022 17:08:29 +0000
Subject: [PATCH 1/1] CHANGELOG: Fix an URL to the Git "master" branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mercurial used the default branch name "default", while Git uses
"master". Since Doomseeker 1.3.1, Bitbucket discontinued Mercurial
support and we (the developers of this Doomseeker project) migrated this
project's repository from Mercurial to Git (#3701) in late 2019.
As usual with everything in the year 2019, the repository's default
branch name was undeviating from Git, holding no political beliefs:
"master". This is (and was) common practice (at the time).
In the summer 2020, the git.git project maintainers bent over some to
political pressure from a vocal minority of users and added the
"init.defaultBranch" config option starting with the Git 2.28 release.
With this came the expectation that the default Git branch might not be
named "master" commonly anymore, however it still is as of Git 2.34.1
today (and is still referred to as "master" in the gitworkflows(7)
manual, although "git init" for new Git repositories can raise warnings
about this naming).
Gauging emoji reactions on external project issues and discussions
whenever politically controversial changes are done to replace
"master/slave" or "whitelist/blacklist" associations, these changes
don't seem to be well received among the general population (hackers,
developers, users in the majority).
From Doomseeker's perspective, we have a different issue related to
"master" branch name. Our CHANGELOG.md has been referring to the
"default" branch name since our migration to Git on Bitbucket
(Doomseeker 1.3.1). Those "default" branch URLs in older releases may be
followed to a HTTP error page "404 Not Found".
Because there's no expectation for Atlassian (Bitbucket) to support HTTP
redirects (and whatnot) for our project to redirect from "default" to
"master", I (the reporter of this issue and author of this commit)
suggested a change to be made to the Doomseeker project repository:
Either the CHANGELOG.md should be updated to refer to the new "master"
branch URL to fix a bug (older releases will still have URLs with link
rot), or the project's branch name and pipeline configuration be adapted
to prevent link rot found in older releases. I've suggested the prior
solution, but provided patches for both solutions. (If you are reading
this, take a guess from this commit which or both solutions the
maintainers of this project chose.)
Fixes: #3969
Nota bene (NB): Below I've included some URLs for further reading, some
dating back to 2014, for the uglier political side of this change that
may be subject to controversy and a git-revert(1).
See: https://github.com/django/django/pull/2692
See: https://bugs.python.org/issue34605
See: https://www.drupal.org/node/2275877
See: https://github.com/uBlockOrigin/uMatrix-issues/issues/275
See: https://github.com/vector-im/element-android/issues/1705
See: https://gitlab.com/gitlab-org/gitlab/-/issues/7554
See: https://www.phoronix.com/scan.php?page=news_item&px=Linux-5.8-Inclusive-Terminology
See: http://antirez.com/news/122
See: https://github.com/redis/redis/issues/3185
See: https://github.com/redis/redis/issues/5335
See: https://mailarchive.ietf.org/arch/msg/dnsop/RFbV_nBJdJSvBhByxH30K7zvSxw/
NB: Praise to Poland and our well-adjusted individual maintainers
capable of making decisions. 🤡 Did you know Poland is one of the very
few currently remaining European countries with membership in the
European Union rejecting much of the globohomo lobbying from foreign
agents (including the EU)? This part is not a Git note (git-notes(1)).
Here be the landmines. The beliefs of this commit's author are your
employer's. There are only two genders and we don't need more mental
health issues to degrade our society. Commit functional changes, not
politics or distorted and often unscientific ideology.
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b36d0ad..580e295e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog
Visit this file cleanly formatted in repository:
-<https://bitbucket.org/Doomseeker/doomseeker/src/default/CHANGELOG.md>
+<https://bitbucket.org/Doomseeker/doomseeker/src/master/CHANGELOG.md>
This file follows the format of
[Keep a Changelog 1.0.0](https://keepachangelog.com/en/1.0.0/),
--
2.34.1
0001-pipelines-Change-the-Git-branch-name-to-default.patch [^] (4,455 bytes) 2022-01-18 17:12 [Show Content] [Hide Content]From 1386533fe7ce668f53e22b424a656d55ae360019 Mon Sep 17 00:00:00 2001
From: Linda Lapinlampi <linda@lindalap.fi>
Date: Tue, 18 Jan 2022 15:46:27 +0000
Subject: [PATCH 1/1] pipelines: Change the Git branch name to "default"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mercurial used the default branch name "default", while Git uses
"master". Since Doomseeker 1.3.1, Bitbucket discontinued Mercurial
support and we (the developers of this Doomseeker project) migrated this
project's repository from Mercurial to Git (#3701) in late 2019.
As usual with everything in the year 2019, the repository's default
branch name was undeviating from Git, holding no political beliefs:
"master". This is (and was) common practice (at the time).
In the summer 2020, the git.git project maintainers bent over some to
political pressure from a vocal minority of users and added the
"init.defaultBranch" config option starting with the Git 2.28 release.
With this came the expectation that the default Git branch might not be
named "master" commonly anymore, however it still is as of Git 2.34.1
today (and is still referred to as "master" in the gitworkflows(7)
manual, although "git init" for new Git repositories can raise warnings
about this naming).
Gauging emoji reactions on external project issues and discussions
whenever politically controversial changes are done to replace
"master/slave" or "whitelist/blacklist" associations, these changes
don't seem to be well received among the general population (hackers,
developers, users in the majority).
From Doomseeker's perspective, we have a different issue related to
"master" branch name. Our CHANGELOG.md has been referring to the
"default" branch name since our migration to Git on Bitbucket
(Doomseeker 1.3.1). Those "default" branch URLs in older releases may be
followed to a HTTP error page "404 Not Found".
Because there's no expectation for Atlassian (Bitbucket) to support HTTP
redirects (and whatnot) for our project to redirect from "default" to
"master", I (the reporter of this issue and author of this commit)
suggested a change to be made to the Doomseeker project repository:
Either the CHANGELOG.md should be updated to refer to the new "master"
branch URL to fix a bug (older releases will still have URLs with link
rot), or the project's branch name and pipeline configuration be adapted
to prevent link rot found in older releases. I've suggested the prior
solution, but provided patches for both solutions. (If you are reading
this, take a guess from this commit which or both solutions the
maintainers of this project chose.)
Fixes: #3969
Nota bene (NB): Below I've included some URLs for further reading, some
dating back to 2014, for the uglier political side of this change that
may be subject to controversy and a git-revert(1).
See: https://github.com/django/django/pull/2692
See: https://bugs.python.org/issue34605
See: https://www.drupal.org/node/2275877
See: https://github.com/uBlockOrigin/uMatrix-issues/issues/275
See: https://github.com/vector-im/element-android/issues/1705
See: https://gitlab.com/gitlab-org/gitlab/-/issues/7554
See: https://www.phoronix.com/scan.php?page=news_item&px=Linux-5.8-Inclusive-Terminology
See: http://antirez.com/news/122
See: https://github.com/redis/redis/issues/3185
See: https://github.com/redis/redis/issues/5335
See: https://mailarchive.ietf.org/arch/msg/dnsop/RFbV_nBJdJSvBhByxH30K7zvSxw/
NB: Praise to Poland and our well-adjusted individual maintainers
capable of making decisions. 🤡 Did you know Poland is one of the very
few currently remaining European countries with membership in the
European Union rejecting much of the globohomo lobbying from foreign
agents (including the EU)? This part is not a Git note (git-notes(1)).
Here be the landmines. The beliefs of this commit's author are your
employer's. There are only two genders and we don't need more mental
health issues to degrade our society. Commit functional changes, not
politics or distorted and often unscientific ideology.
---
bitbucket-pipelines.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index de31e541..96974c82 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -16,7 +16,7 @@ stepsDefined:
pipelines:
branches:
- master:
+ default:
- step: *qt5Build
custom:
Qt5Build:
--
2.34.1
|