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.

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

Add .gitattributes to ensure project consistent line endings #4037

Merged
merged 1 commit into from Jul 6, 2020
Merged

Add .gitattributes to ensure project consistent line endings #4037

merged 1 commit into from Jul 6, 2020

Conversation

mikeshardmind
Copy link
Contributor

@mikeshardmind mikeshardmind commented Jul 4, 2020

  • Renormalized as well

Type

  • Bugfix
  • Enhancement
  • New feature

Description of the changes

Noticed this as I was updating my fork, line endings are getting thrashed with ^M

commit that brought it to my attention is below, but there's no fault to ascribe to anyone here. Just something that happens when different OSes and editors handle it differently.

git show 7d30e3de14264b86b5d18bac619ad476473d4467
commit 7d30e3de14264b86b5d18bac619ad476473d4467
Author: aikaterna <20862007+aikaterna@users.noreply.github.com>
Date:   Tue Jun 30 18:29:16 2020 -0700

    [Utils] Fix regex for role mentions in `MessagePredicate` (#4030)

diff --git a/redbot/core/utils/predicates.py b/redbot/core/utils/predicates.py
index 76c0dd8a..415a2bbb 100644
--- a/redbot/core/utils/predicates.py
+++ b/redbot/core/utils/predicates.py
@@ -10,7 +10,7 @@ from redbot.core import commands
 _ID_RE = re.compile(r"([0-9]{15,21})$")
 _USER_MENTION_RE = re.compile(r"<@!?([0-9]{15,21})>$")
 _CHAN_MENTION_RE = re.compile(r"<#([0-9]{15,21})>$")
-_ROLE_MENTION_RE = re.compile(r"<&([0-9]{15,21})>$")
+_ROLE_MENTION_RE = re.compile(r"<@&([0-9]{15,21})>$")^M


 class MessagePredicate(Callable[[discord.Message], bool]):

I'm not sure if this also should necessitate a CI check, depends on if Github's web editor respects .gitattributes or not (I assume it does given github has an article about this)

@mikeshardmind mikeshardmind requested a review from palmtree5 as a code owner Jul 4, 2020
@jack1142 jack1142 added the Type: Enhancement label Jul 6, 2020
@jack1142 jack1142 self-assigned this Jul 6, 2020
Copy link
Member

@jack1142 jack1142 left a comment

Looks good to me, nothing can really break with this.

@jack1142 jack1142 added the Changelog Entry: Skipped label Jul 6, 2020
@jack1142 jack1142 merged commit d869410 into Cog-Creators:V3/develop Jul 6, 2020
6 checks passed
@jack1142 jack1142 added QA: Passed and removed QA: Needed labels Jul 6, 2020
@mikeshardmind mikeshardmind deleted the gitattributes branch Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Category: Meta Changelog Entry: Skipped QA: Passed Type: Enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants