From fb7a8221fbeb91cfeae0bfd36749d8397977efea Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Thu, 15 Feb 2024 09:43:57 -0600 Subject: [PATCH 1/4] ci/lint: add Reapply to the no prefix whitelist You get a special award if you commit one of these. --- ci/lint-commit-msg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/lint-commit-msg.py b/ci/lint-commit-msg.py index 4198ed4feb16f..0bfad08a3abc3 100755 --- a/ci/lint-commit-msg.py +++ b/ci/lint-commit-msg.py @@ -56,7 +56,7 @@ def do_lint(commit_range: str) -> bool: ################################################################################ -NO_PREFIX_WHITELIST = r"^Revert \"(.*)\"|^Release [0-9]|^Update VERSION$" +NO_PREFIX_WHITELIST = r"^Revert \"(.*)\"|^Reapply \"(.*)\"|^Release [0-9]|^Update VERSION$" @lint_rule("Subject line must contain a prefix identifying the sub system") def subsystem_prefix(body): @@ -98,7 +98,7 @@ def no_merge(body): @lint_rule("Subject line should be shorter than 72 characters") def line_too_long(body): - revert = re.search(r"^Revert \"(.*)\"", body[0]) + revert = re.search(r"^Revert \"(.*)\"|^Reapply \"(.*)\"", body[0]) return True if revert else len(body[0]) <= 72 @lint_rule("Prefix should not include C file extensions (use `vo_gpu: ...` not `vo_gpu.c: ...`)") From ba344e7371ac929b1e401099e565a3d133f0e8a7 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Thu, 15 Feb 2024 09:49:07 -0600 Subject: [PATCH 2/4] Reapply "player: not a real commit" --- player/core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player/core.h b/player/core.h index 8a49585cdf1e8..57f0d1eaef2ef 100644 --- a/player/core.h +++ b/player/core.h @@ -123,7 +123,7 @@ struct track { bool image; bool attached_picture; char *lang; - +//// // If this track is from an external file (e.g. subtitle file). bool is_external; bool no_default; // pretend it's not external for auto-selection From f0038b8ee7900d508032861c1eeda6cb4fa320cb Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Thu, 15 Feb 2024 09:49:36 -0600 Subject: [PATCH 3/4] Reapply "sub: really super long commit for testing purposes to see if it works" --- player/sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player/sub.c b/player/sub.c index 5d7baef3e6ee4..e476d2cc47b88 100644 --- a/player/sub.c +++ b/player/sub.c @@ -60,7 +60,7 @@ void reset_subtitle_state(struct MPContext *mpctx) reset_subtitles(mpctx, mpctx->tracks[n]); term_osd_set_subs(mpctx, NULL); } - +///////// void uninit_sub(struct MPContext *mpctx, struct track *track) { if (track && track->d_sub) { From 5e84fbb26e9476caad89248a16ed4bc6af4449a0 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Thu, 15 Feb 2024 09:53:43 -0600 Subject: [PATCH 4/4] Reapply should fail --- player/screenshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player/screenshot.c b/player/screenshot.c index f537fc4604353..30685b3c0f15c 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -18,7 +18,7 @@ #include #include #include - +///////////// #include #include "common/global.h"