Skip to content

Commit d715004

Browse files
authored
Revert "Change how the git CLI subprocess is executed (#684)"
This reverts commit 47a0c13.
1 parent 1b5c56b commit d715004

21 files changed

+550
-1062
lines changed

.github/workflows/continuous_integration.yml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,35 @@ name: CI
22

33
on:
44
push:
5-
branches: [master,v1]
5+
branches: [master]
66
pull_request:
7-
branches: [master,v1]
7+
branches: [master]
88
workflow_dispatch:
99

1010
jobs:
11-
build:
12-
name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
13-
runs-on: ${{ matrix.operating-system }}
14-
continue-on-error: ${{ matrix.experimental == 'Yes' }}
15-
env: { JAVA_OPTS: -Djdk.io.File.enableADS=true }
16-
11+
continuous_integration_build:
12+
continue-on-error: true
1713
strategy:
1814
fail-fast: false
1915
matrix:
20-
# Only the latest versions of JRuby and TruffleRuby are tested
21-
ruby: ["3.0", "3.1", "3.2", "3.3", "truffleruby-23.1.1", "jruby-9.4.5.0"]
16+
ruby: [3.0, 3.1, 3.2, 3.3]
2217
operating-system: [ubuntu-latest]
23-
experimental: [No]
2418
include:
25-
- # Building against head version of Ruby is considered experimental
26-
ruby: head
19+
- ruby: head
2720
operating-system: ubuntu-latest
28-
experimental: Yes
29-
30-
- # Only test with minimal Ruby version on Windows
31-
ruby: 3.0
21+
- ruby: truffleruby-23.1.1
22+
operating-system: ubuntu-latest
23+
- ruby: 3.0
3224
operating-system: windows-latest
33-
34-
- # Since JRuby on Windows is known to not work, consider this experimental
35-
ruby: jruby-9.4.5.0
25+
- ruby: jruby-9.4.5.0
3626
operating-system: windows-latest
37-
experimental: Yes
27+
28+
name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
29+
30+
runs-on: ${{ matrix.operating-system }}
31+
32+
env:
33+
JAVA_OPTS: -Djdk.io.File.enableADS=true
3834

3935
steps:
4036
- name: Checkout Code

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The changes coming in this major release include:
4040
* Update the required Git command line version to at least 2.28
4141
* Update how CLI commands are called to use the [process_executer](https://github.com/main-branch/process_executer)
4242
gem which is built on top of [Kernel.spawn](https://ruby-doc.org/3.3.0/Kernel.html#method-i-spawn).
43-
See [PR #684](https://github.com/ruby-git/ruby-git/pull/684) for more details
43+
See [PR #617](https://github.com/ruby-git/ruby-git/pull/617) for more details
4444
on the motivation for this implementation.
4545

4646
The tentative plan is to release `2.0.0` near the end of March 2024 depending on

bin/command_line_test

Lines changed: 0 additions & 180 deletions
This file was deleted.

git.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
2828
s.requirements = ['git 2.28.0 or greater']
2929

3030
s.add_runtime_dependency 'addressable', '~> 2.8'
31-
s.add_runtime_dependency 'process_executer', '~> 0.7'
3231
s.add_runtime_dependency 'rchardet', '~> 1.8'
3332

3433
s.add_development_dependency 'minitar', '~> 0.9'

lib/git.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
require 'git/branch'
99
require 'git/branches'
1010
require 'git/command_line_result'
11-
require 'git/command_line'
1211
require 'git/config'
1312
require 'git/diff'
1413
require 'git/encoding_utils'
@@ -24,7 +23,6 @@
2423
require 'git/repository'
2524
require 'git/signaled_error'
2625
require 'git/status'
27-
require 'git/signaled_error'
2826
require 'git/stash'
2927
require 'git/stashes'
3028
require 'git/url'

0 commit comments

Comments
 (0)