[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #30967 [Core Tor/Tor]: Make shellcheck ignore user-created directories, and run it during pre-commit
#30967: Make shellcheck ignore user-created directories, and run it during pre-
commit
-------------------------------------------------+-------------------------
Reporter: teor | Owner: (none)
Type: defect | Status:
| merge_ready
Priority: High | Milestone: Tor:
| 0.4.2.x-final
Component: Core Tor/Tor | Version: Tor:
| unspecified
Severity: Major | Resolution:
Keywords: fast-fix, teor-backlog-ci, | Actual Points: 0.2
042-should, tor-ci-fail-sometimes, asn-merge, |
dgoulet-merge, nickm-merge |
Parent ID: | Points: 0.1
Reviewer: catalyst | Sponsor:
| Sponsor31-can
-------------------------------------------------+-------------------------
Changes (by teor):
* keywords: fast-fix, teor-backlog-ci, 042-should, tor-ci-fail-sometimes
=>
fast-fix, teor-backlog-ci, 042-should, tor-ci-fail-sometimes, asn-
merge, dgoulet-merge, nickm-merge
* status: needs_revision => merge_ready
Comment:
See my pull request:
* master: https://github.com/torproject/tor/pull/1278
I fixed the merge conflict by rebasing on master, and force-pushing the
result.
We added two files to EXTRA_DIST, and the lines were next to each other.
I put the lines in the correct order.
Please check CI passes before merging.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30967#comment:7>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs