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

maint: Ignore formatting changes in history #3738

Merged
merged 6 commits into from
Jan 13, 2025
Merged

maint: Ignore formatting changes in history #3738

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
451c590
Update .git-blame-ignore-revs for .pre-commit-config.yaml and .clang-…
mathbunnyru Jan 12, 2025
03c8480
Update .git-blame-ignore-revs
mathbunnyru Jan 13, 2025
406764f
Update .git-blame-ignore-revs
mathbunnyru Jan 13, 2025
bf298b1
Better comment style
mathbunnyru Jan 13, 2025
f5a2529
Ignore prettier pre-commit changes
mathbunnyru Jan 13, 2025
4bc7889
Not ignore one more change
mathbunnyru Jan 13, 2025
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
81 changes: 80 additions & 1 deletion .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
# This file is read by GitHub and `git blame --ignore-revs-file`.
# See: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view

# Revert "Change brace space in clang-format (#2627)"
jjerphan marked this conversation as resolved.
Show resolved Hide resolved
# --------------------------------------

# The following section was generated by running:
# `git log --format="# %s%n%H" .clang-format`
# These entries have been manually removed from the output
# since they change more than styling:
#
# MRepo refactor (#3118)
# 7d6856e9b56fbff35a6563889a737824054cf51f
# Add CondaURL (#2805)
# a527511c14ade1db03b3a88cf9c603eb35469663
# bump clang-format to 13.0.1 and make it work again
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# bump clang-format to 13.0.1 and make it work again
# bump clang-format to 13.0.1 and make it work again (PR number)

Can we add the PR number like in the others? (some numbers are missing here and there below).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was no PR: 7f9c5ad
https://github.com/search?q=repo%3Amamba-org%2Fmamba+bump+clang-format+to+13.0.1&type=pullrequests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I don't want to manually add PR numbers to other places - I don't see a lot of sense, and it will be more difficult to update this file later (more manual changes - less clear it is).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that we shouldn't do this manually, but I'm wondering why it was added automatically in some and not others? Was it because they were all not PRs?

Copy link
Contributor Author

@mathbunnyru mathbunnyru Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of them were PRs.

Until 2022-10-26, some PRs were not squashed when merged to the main branch.
If you squash merge, GitHub automatically adds a PR number to the commit message.
If you don't, then you get the original commit and the original commit message (so there will be no PR number).

You can notice, that the lines without PR numbers are always at the bottom of the lists, so we won't have such a problem in the future (unless someone forgets to squash when merging the PR).

# 7f9c5adb778e4fc8537c81cc078ad7da2052169f

# Enforce space between definitions (#3049)
21675b6517ff5da3c4dc91b9083366136308db2d
# Attempt to fix CI (#2637)
50a627e002d8260fa2e116e5833190a135aff4e8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be more than formatting, so should be commented?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is 99.9% formatting: 50a627e
Moreover, this commit has been ignored for several years:

mamba/.git-blame-ignore-revs

Line 5 in d0c7458

50a627e002d8260fa2e116e5833190a135aff4e8

(Don't look at the wrong commit message in main, but exactly this commit hash is already ignored in main).

# Change brace space in clang-format (#2627)
3dce9901118a837f889139a052ccc915e0b63198
Expand All @@ -11,3 +27,66 @@
365342cc045a21bfb7a93fccd50a47fdbd573e47
# Add cpp linter and fix warnings
98f2530d2384f7e4a03742b5b191919391ce71e6

# --------------------------------------

# The following section was generated by running:
# `git log --format="# %s%n%H" .pre-commit-config.yaml`
# These entries have been manually removed from the output
# since they change more than styling:
#
# Fix compilation with -Werror=unused-result (#3676)
# 693ee82c7bb0838c47e1ed6820fa3c0d7fe069d5
# Add MatchSpec doc and fix errors (#3224)
# a00ef3567585e0d14921c2c3f3c07ade5c163496
# Modularize libmambapy (#2960)
# 0d42e816675a182a7994070a5c7c99651f93755f
# Fix Ci (#2889)
# 7c02338cb55b2bd11ef0a5f96314dc2338360536
# Structure test directory layout (#2380)
# aa8d28c6c58369734e40d59c137316d71db61bf9
# use local meta.yaml for static builds (#2214)
# e9695a45cc10848375d449a280282f6d29a8bb6c
# Fix JSON output issues (#1600)
# 048cb67f6285493fd7e1788adfddaa185edaa256
# bump clang-format to 13.0.1 and make it work again
# 7f9c5adb778e4fc8537c81cc078ad7da2052169f
# add tests for etag/mod/etc reading in cache
# 7e4c03245b6c58af150f1a4d99bd3ee6a19c418f

# maint: Add prettier pre-commit hook (#3663)
d0c74588392c584ffc8ba5be92bd0924454b756c
# maint: Add pre-commit typos back (#3682)
99290aeebfcc72358f20d22cea31a0d733f1f9ec
# maint: Add pyupgrade pre-commit hook (#3671)
f67914ef8a77d60acef3eb2e598542d23fc26e28
# maint: Update clang-format to v19 (#3600)
ad9b2d6b8840825411a3c23251cfbb978ab60e89
# Update pre-commit hooks except clang-format (#3599)
0f4ad44c2e6ea11825c8ea3c4e92cf9bbf633086
# Add checking typos to pre-commit (#3278)
3e1e97b0e6e49cac042cff7396fbbe5e71a63a9f
# Update pre-commit hooks" (#3252)
245de2009e037ac3bd68f68578bfbf35f296efff
# Move to Ruff (#3011)
1230b9209466fdd386a3160033f1d71af5f244e6
# Add cmake-format (#2962)
d116ff891798b0d915d84d496d65ec143412febd
# Update pre-commit hooks (#2586)
48d595ae455e6b15778077d3ee898d8f48ee8526
# Update pre-commit versions (#2178)
6e4011c38d52928594e5a8ca5967956edf83bc29
# Update flake8 pre-commit versions (#2117)
5fd5c955d1dfa581a8f9a1eb62f1a72f41c6680c
# Update pre-commit-config (#2092)
557e232ff5c9d44ea9eeeaa68c5975b2f0566074
# Upgrade pre-commit env (#1602)
81f2ffe03681f1312f341b655d90b5346275fbed
# Get clang-format from PyPI and version pre-commit hook
01a336c0c154f15d7a5414bce4af85b71718ec65
# Update pre-commit versions
3719781cdfef64081114741cf1df39573c1c2831
# Add cpp linter and fix warnings
98f2530d2384f7e4a03742b5b191919391ce71e6
# Add pre-commit configuration
5c2951cc181d383e131fc345d439fc2878fe94db
Loading