Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci/lint: add Reapply to the no prefix whitelist #20

Closed
wants to merge 4 commits into from
Closed

ci/lint: add Reapply to the no prefix whitelist #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb7a822
ci/lint: add Reapply to the no prefix whitelist
Dudemanguy Feb 15, 2024
ba344e7
Reapply "player: not a real commit"
Dudemanguy Feb 15, 2024
f0038b8
Reapply "sub: really super long commit for testing purposes to see if…
Dudemanguy Feb 15, 2024
5e84fbb
Reapply should fail
Dudemanguy Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/lint-commit-msg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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: ...`)")
Expand Down
2 changes: 1 addition & 1 deletion player/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion player/screenshot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>

/////////////
#include <libavcodec/avcodec.h>

#include "common/global.h"
Expand Down
2 changes: 1 addition & 1 deletion player/sub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading