This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Fix handling of ** in .gitignore files by updating to a libgit2 fork #97
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nathansobo
force-pushed
the
ns/fix-gitignore
branch
from
3c28ab2 to
5c02832
Compare
nathansobo
force-pushed
the
ns/fix-gitignore
branch
from
5c02832 to
7aa4ed4
Compare
Co-Authored-By: Antonio Scandurra <as-cii@github.com>
nathansobo
force-pushed
the
ns/fix-gitignore
branch
from
f5e57b7 to
12d7ac6
Compare
Contributor
|
Fixes #92. |
Contributor
Author
|
I'm holding off until I get feedback around the stability of code that's on libgit2 master but not published as an official release. |
Contributor
Author
|
Cool. As I expected, the maintainers of libgit2 have confidence in the stability of master, so I will proceed. |
nathansobo
pushed a commit
to atom/atom
that referenced
this pull request
Jun 20, 2019
Incorporates changes in atom/git-utils#97
tunmiseo
added a commit
to tunmiseo/atom
that referenced
this pull request
Feb 14, 2020
* Pass `policyFileName` variable to RPM spec template * ⬆️ git-utils@5.6.1 to fix .gitignore edge cases Incorporates changes in atom/git-utils#97 * Upgrade npm on Azure Pipelines when running macOS tests * ⬆️ find-and-replace@0.218.14 to fix flaky tests * Default to no Tree-sitter grammars * restore tree-sitter in grammar iterator * adjust specs * fix lint * fix spec * ⬆️ tree-sitter for incremental parsing bugfix * ⬆️ electron@4.2.5 * fix comment docks * Post crash reports to https://atom.io/crash_reports if consented Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * Remove redundant info when starting crash reporter Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * Add platformRelease to data posted to Atom.io with crashes Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * Include architecture in data posted to Atom.io with crashes * Include the release channel in data posted to Atom.io with crashes * Fix lint error * Spawn updated Atom immediately instead of waiting for `will-quit` event Spawning the new version of Atom within a `will-quit` handler would cause Electron to quit before having a chance to actually run the executable. There may still be a possibility of raciness between closing the old version of Atom and opening the new one, causing resource contention between the two processes (e.g., IndexedDb) or failing to spawn the new process before the previous one quits. Addressing such raciness perfectly would require a much more complex solution and this approach is working for us consistently in our tests. Co-Authored-By: Nathan Sobo <nathan@github.com> * Delete implementation-dependent test Co-Authored-By: Nathan Sobo <nathan@github.com> * Upgrade language-javascript to v0.130.2 Co-Authored-By: Nathan Sobo <nathan@github.com> * Specify exe in the metadata Because we changed it to be atom-beta.exe on beta for example this is required for electron-winstaller to find the executable * Use a different name depending on channel This makes Atom beta install in %LOCALAPPDATA%\atom-beta and stable in %LOCALAPPDATA%\atom so that installs are side by side * Rely on Azure Pipelines instead of Travis for Linux builds * ⬆️ spellchecker@3.6.1 * Update getInvisibles documentation fixes atom#16042 * Run prettier * ⬆️ fuzzy-finder@1.13.9 * ⬆️ find-and-replace@0.218.15 * ⬆️ language-javascript@0.132.0 * Send OS version to the autoupdate endpoint * Debounce the resize event handler * Fix issue when ripgrep returns matches that are empty * Add ripgrep pcre2 support 👕 fix lint Co-Authored-By: Rafael Oleza <rafeca@gmail.com> fix passing PCRE2 flag in specs 👕 fix lint * ⬆️ fuzzy-finder@1.14.0 * Upgrade language-php@0.44.2 * ⬆️ find-and-replace@0.219.0 * Create get-app-name module that returns correct application name Before, in order to retrieve the application name, Electron's `getName()` method was used (https://electronjs.org/docs/api/app#appgetname). Now, instead, we also use the Atom version in order to calculate the release channel and be able to have it on the app name (e.g `Atom Nightly`). * Revert breaking changes on the WinShell module In earlier commits from this PR, some breaking changes were done to the WinShell module, which cause some issues on the `settings` package (and potentially other packages). Since these breaking changes are not needed (and they don't provide even a better API), this PR reverts them to keep the previous contract. * Append the release channel to the AppUserModelId This allows each release channel to be pinned separately on Windows * Fix squirrel-update specs * Make get-app-name module compatible with the renderer process This module is required both from the main process and the renderer process, since `win-shell.js` is also required from both processes (which is nuts). In order to make it work when used from the main process, `get-app-name` just falls back to use the `atom-environment` `getAppName()` method. * 👕 * Fix creation of binary folders On cbe5495 I forgot to update the callers of handleStartupEvent() and restartAtom() which no longer expect an app object to be passed. * Rename the sh commands in the bin folder This fixes an issue where atom stable would not launch correctly from powershell if it was not the first entry in path because it tries to execute the shell script from another channel * Do not add the release channel on stable versions of Atom This is done to avoid changing the application user model id on Atom stable, which prevents pins from currently installed Atom stable versions to stop working. * ⬆️ apm * ⬆️ electron@4.2.6 * Use the correct executable name on the code signing tool * ⬆️ apm * Do not depend on CONFIG.executableName on the windows tests CONFIG.executableName depends on the ATOM_RELEASE_VERSION env variable to work correctly on nightly releases. Since this env variable is not being set for the testing steps, the nightly release builds contain a wrong executableName on the testing step, which causes a failure when trying to find the Atom executable. This commit fixes that by stop using the executableName from the test step, like it's done on other platforms. * Calculate correctly the nupkg filenames when uploading artifacts * Upgrade apm@2.4.2 * 1.41.0-dev * GitHub package prerelease * Minor version bump * ⬆️ electron@4.2.7 * Downgrade Ubuntu to 14.04 * WIP: Temporarily upload artifacts on builds triggered by pull requests * Install ICU dev tools to fix artifact caching tool * Revert "WIP: Temporarily upload artifacts on builds triggered by pull requests" This reverts commit 10fc3f2. Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * Re-enable CI for Windows and macOS on Azure pipelines Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * Upgrade tello to v1.2.0 Fixes atom#16106 Fixes atom#17746 * Upgrade language-shellscript to 0.28.0 * Upgrade language-ruby to 0.72.18 * Write test to demonstrate injection grammar bug Co-Authored-By: Nathan Sobo <nathan@github.com> * Only cover parent scope boundaries if nested layer has a scope boundary * Fix linter errors * Use class colors for inherited classes in One syntax themes * Report scopes from shallower layers at the start or end of an injection * Detect the end of an injected tree based on the iterator's state * Fix linter errors * ⬆️ language-ruby@0.72.19 * ⬆️ language-ruby@0.72.20 * add support for jasmine.any * fix checking for jasmineMatches on null * add spec-helper tests * Fix typo in comment Co-authored-by: Antonio Scandurra <as-cii@github.com> * Remove test that's testing a test helper We appreciate the thoroughness, but we think it's OK to _not_ have this level of meta-testing at this point in the project. Co-authored-by: Antonio Scandurra <as-cii@github.com> * ⬆️ notifications@0.71.0 * 🔥 Remove unused TimeReporter class * 1.42.0-dev * ⬆️ language-html@0.53.0 * ➡️ Migrate core package 'welcome' into ./packages * 👕 * ➡️ Migrate core package 'update-package-dependencies' into ./packages * 👕 * ⬆️ language-ruby@0.72.21 * Bump lodash.template from 4.4.0 to 4.5.0 in /script Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.4.0...4.5.0) Signed-off-by: dependabot[bot] <support@github.com> * Bump lodash.merge from 4.6.1 to 4.6.2 in /script Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot[bot] <support@github.com> * Bump lodash from 4.17.10 to 4.17.15 in /packages/about Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.15) Signed-off-by: dependabot[bot] <support@github.com> * Bump fstream from 0.1.24 to 1.0.12 Bumps [fstream](https://github.com/npm/fstream) from 0.1.24 to 1.0.12. - [Release notes](https://github.com/npm/fstream/releases) - [Commits](npm/fstream@v0.1.24...v1.0.12) Signed-off-by: dependabot[bot] <support@github.com> * Bump js-yaml from 3.12.0 to 3.13.1 in /packages/about Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.12.0...3.13.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump underscore.string from 3.3.4 to 3.3.5 in /script Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5. - [Release notes](https://github.com/epeli/underscore.string/releases) - [Changelog](https://github.com/epeli/underscore.string/blob/master/CHANGELOG.markdown) - [Commits](esamattis/underscore.string@3.3.4...3.3.5) Signed-off-by: dependabot[bot] <support@github.com> * Bump js-yaml from 3.12.0 to 3.13.1 in /script Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.12.0...3.13.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump extend from 3.0.1 to 3.0.2 in /script/vsts Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/justmoon/node-extend/releases) - [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md) - [Commits](justmoon/node-extend@v3.0.1...v3.0.2) Signed-off-by: dependabot[bot] <support@github.com> * ⬆️ apm@2.4.3 * ⬆️ github@0.31.0 * 🐛 Recognize git worktree directories as valid git repositories fixes atom#8168 * Create noooo * Create blah * Revert "Create noooo" This reverts commit bea1bc7. * Revert "Create blah" This reverts commit 254b2f3. * ⬆️ language-ruby@0.72.22 * ⬆️ language-javascript@0.133.0 * ⬆️ language-gfm@0.90.7 * Fix base16 project link * ⬆️ language-typescript@0.5.3 * Revert "⬆️ language-typescript@0.5.3" * ⬆️ language-typescript@0.5.3 * Update URL used for jasmine-node in package-lock.json * ⬆️language-php@0.443 * Apply suggestions from code review Change language-typescript@0.5.2 to language-typescript@0.5.3 Co-Authored-By: Jason Rudolph <jason@jasonrudolph.com> * 1.43.0-dev * Fix language-typescript version in package.json * ⬆️ tree-sitter * ⬆️ language-sass@0.62.1 * Fixed unable to copy selected text from spec-suite window * ⬆️ open-on-github@1.3.2 * ⬆️ find-and-replace@0.219.1 * added test * added test * Fixed lint errors again * ⬆️ tree-sitter * Removed test * ⬆️ language-php@0.44.4 * ⬆️ github@0.31.1 * ⬆️ language-css@0.44.1 * Fix package-lock * ⬆️ language-css@0.44.2 * ⬆️ first-mate@7.4.1 bracket-matcher@0.91.2 * ⬆️ language-javascript@0.133.1 * ⬆️ text-buffer@13.17.1 * ⬆️ language-javascript@0.134.0 fuzzy-finder@1.14.1 * update language-java to 0.31.4 * ⬆️ nsfw@1.0.26 & language-typescript@0.6.0 * ⬆️ tree-sitter * 1.44.0-dev * ⬆️ tree-sitter for null character bugfix * ⬆️ github * ⬆️ github * Update LICENSE.md * Update LICENSE.md * 1.45.0-dev * Upgrade macos image to Majove to support notarization * Enable hardend runtime for code-signing on mac * Pass notarization credentials to the build script * Add notarization to the build process * Remove entitlement allow-jit and Downgrade CI to MacOS 10.13 * Attempt fix by adding more entitlements * Correct entitlements path * Try to make the app work with minimum entitlements * Fix startup issue after notarization * switch from atom's special winstaller version to electron's winstaller * ⬆️ github * revert notarization * 1.46.0-dev * ⬆️ find-and-replace@0.219.3 * ⬆️ archive-view@0.65.2 Co-authored-by: Benjamin Gray <bengray178@gmail.com> Co-authored-by: Nathan Sobo <nathan@github.com> Co-authored-by: Max Brunsfeld <maxbrunsfeld@github.com> Co-authored-by: Rafael Oleza <rafeca@gmail.com> Co-authored-by: Tony Brix <tony@brix.ninja> Co-authored-by: Jason Rudolph <jason@jasonrudolph.com> Co-authored-by: Winston Liu <Wliu1402@gmail.com> Co-authored-by: Linus Eriksson <Ben3eeE@users.noreply.github.com> Co-authored-by: David Luzar <luzar.david@gmail.com> Co-authored-by: Hubot <hubot@users.noreply.github.com> Co-authored-by: Ash Wilson <smashwilson@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexis King <lexi.lambda@gmail.com> Co-authored-by: Katrina Uychaco <kuychaco@github.com> Co-authored-by: Marek Jeszka <1138746+marekjeszka@users.noreply.github.com> Co-authored-by: Landon Abney <github@arcanemag.us> Co-authored-by: Lee Dohm <1038121+lee-dohm@users.noreply.github.com> Co-authored-by: Musa Ibrahim <small_musa@hotmail.com> Co-authored-by: Mazen El-Kashef <mazen.elkashef@gmail.com> Co-authored-by: Ivan <ivan.sadikov@databricks.com> Co-authored-by: Angel_Kitty <angelkitty6698@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes atom/tree-view#1317
The referenced issue was caused by a divergence between
libgit2andgititself in their handling of**in.gitignorefiles. This PR updates thedeps/libgit2submodule to point at libgit2/libgit2#5110, which updates glob pattern handling to match that ofgit.It probably makes sense to wait until that PR is merged to libgit2 master so we don't have to point our submodule at a fork, but I wanted to get this published anyway.