Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[Master] Ignoring mass reformatting commits with git blame #20578

Merged
merged 4 commits into from
Oct 7, 2021

Conversation

mozga-intel
Copy link
Contributor

@mozga-intel mozga-intel commented Sep 13, 2021

Description

Ignoring bulk change commits with git blame ~ Using --ignore-rev, one can specify a commit to be ignored by git blame.

We can call git blame with the --ignore-revs-file option to ignore all these commits at once:

git config blame.ignoreRevsFile .git-blame-ignore-revs

Before:

e359bcd65e (mozga        2021-09-13 15:28:22 +0200  38)     .set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  39)       using namespace runtime;
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  40)       if (args[0].type_code() == kDLInt) {
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  41)         *ret = Integer(args[0].operator int64_t());
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  42)       } else {
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  43)         LOG(FATAL) << "only accept int";
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  44)       }
e359bcd65e (mozga        2021-09-13 15:28:22 +0200  45)     });

After:

3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  38)     .set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  39)       using namespace runtime;
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  40)       if (args[0].type_code() == kDLInt) {
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  41)         *ret = Integer(args[0].operator int64_t());
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  42)       } else {
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  43)         LOG(FATAL) << "only accept int";
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  44)       }
3f0b049a30 (Haozheng Fan 2020-02-25 04:47:23 +0800  45)     });

Checklist

Essentials

  • PR's title starts with a category (e.g. [BUGFIX], [MODEL], [TUTORIAL], [FEATURE], [DOC], etc)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage
  • Code is well-documented

Changes

  • Feature1, tests, (and when applicable, API doc)
  • Feature2, tests, (and when applicable, API doc)

Comments

  • If this change is a backward incompatible change, why must this change be made.
  • Interesting edge cases to note here

@mxnet-bot
Copy link

Hey @mozga-intel , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [centos-cpu, miscellaneous, unix-gpu, edge, windows-gpu, centos-gpu, clang, sanity, windows-cpu, unix-cpu, website]


Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress labels Sep 13, 2021
@mozga-intel
Copy link
Contributor Author

@mxnet-bot run ci [windows-gpu, windows-cpu, centos-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [windows-gpu, centos-gpu, windows-cpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 13, 2021
@mozga-intel mozga-intel changed the title Ignoring mass reformatting commits with git blame [Master] Ignoring mass reformatting commits with git blame Sep 15, 2021
@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review pr-work-in-progress PR is still work in progress and removed pr-awaiting-review PR is waiting for code review pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 15, 2021
@mozga-intel
Copy link
Contributor Author

@mxnet-bot run ci [centos-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [centos-gpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Sep 15, 2021
@mxnet-bot
Copy link

Jenkins CI successfully triggered : [centos-gpu]

@mseth10 mseth10 added the pr-work-in-progress PR is still work in progress label Sep 15, 2021
@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 15, 2021
@mozga-intel
Copy link
Contributor Author

@mxnet-bot run ci [centos-gpu, centos-cpu]

@mozga-intel
Copy link
Contributor Author

@mxnet-bot run ci [centos-gpu, centos-cpu, windows-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [centos-cpu, windows-gpu, centos-gpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 17, 2021
.git-blame-ignore-revs Show resolved Hide resolved
@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-awaiting-review PR is waiting for code review pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 29, 2021
@mozga-intel
Copy link
Contributor Author

@mxnet-bot run ci [all]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [clang, miscellaneous, windows-cpu, website, sanity, unix-cpu, centos-gpu, centos-cpu, windows-gpu, unix-gpu, edge]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 29, 2021
@akarbown akarbown merged commit 4d48b06 into apache:master Oct 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr-awaiting-review PR is waiting for code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants