git 1.12.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03386fbc4d48647754608adba467800440ec80e5e8aecddac930a3e2565827bd'
-  data.tar.gz: 180866b01d05c40d495638ee8ddf2a1d8ca2e534250575c09c20728a2473855e
+  metadata.gz: 8d000b5ac2ceebebeb6c84eae6aa1c6f4b3d58dd444f15c70390baadf7bb3c8e
+  data.tar.gz: f45ef489fb3aa2d3cff1a45cb127bb27fe380693af5e322220322fd8aa6dfd33
 SHA512:
-  metadata.gz: b5115fff1ce7fbbc3a0fb8d22b8f27b6c3acb00e27613e3e8d0a4d760c2b40a0355a3c2e57e3e8d14e91545f985eea51caca44eab4b04b112f00393e64f48216
-  data.tar.gz: 4494ee6206a07e17b2c1bb983c7519689364c1ec15bfa811a3ab4cf380aba9a29c783adfff82917c0379a7911b2a5a51d0661bf928f69d9502a271d8d11a846e
+  metadata.gz: 6128142518501bce8bd4e5f40e178ac063359916daf544005bdc6187160619b74c6236a7f56b29438f3b5ebb547a5759b59b3140ee260ebd179bc8a4124d1a15
+  data.tar.gz: 56e9d4940992d8feab68502815563d6d16967c1d659748271bdd27e0e1a382f81ce4be4dd7682645b562f8b616be791f79437fdaaa072778aca724c91e40b4d1

data/.github/workflows/continuous_integration.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.7, 3.0]
+        ruby: [2.7, 3.0, 3.1, 3.2]
         operating-system: [ubuntu-latest]
         include:
           - ruby: head
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -5,6 +5,25 @@
 
 # Change Log
 
+## v1.13.1 (2023-01-12)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.0...v1.13.1)
+
+* 667b830 Update the GitHub Action step "actions/checkout" from v2 to v3 (#608)
+* 23a0ac4 Fix version parsing (#605)
+* 429f0bb Update release instructions (#606)
+* 68d76b8 Drop ruby 2.3 build and add 3.1 and 3.2 builds (#607)
+
+## v1.13.0 (2022-12-10)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.12.0...v1.13.0)
+
+* 8349224 Update list of maintainers (#598)
+* 4fe8738 In ls-files do not unescape file paths with eval (#602)
+* 74b8e11 Add start_point option for checkout command (#597)
+* ff6dcf4 Do not assume the default branch is 'master' in tests
+* 8279298 Fix exception when Git is autoloaded (#594)
+
 ## v1.12.0
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.12.0
@@ -151,4 +170,3 @@ See https://github.com/ruby-git/ruby-git/releases/tag/v1.4.0
 ## 1.0.1
 
 * Initial version
-

data/MAINTAINERS.md

@@ -7,7 +7,6 @@
 
 When making changes in this repository, one of the maintainers below must review and approve your pull request.
 
-### Maintainers
-
+* [James Couball](https://github.com/jcouball)
+* [Frank Throckmorton](https://github.com/frankthrock)
 * [Per Lundberg](https://github.com/perlun)
-* [James Couball](https://github.com/jcouball)

data/README.md

@@ -265,6 +265,7 @@ g.branch('existing_branch').checkout
 g.branch('master').contains?('existing_branch')
 
 g.checkout('new_branch')
+g.checkout('new_branch', new_branch: true, start_point: 'master')
 g.checkout(g.branch('new_branch'))
 
 g.branch(name).merge(branch2)

data/RELEASING.md

@@ -8,61 +8,63 @@
 Releasing a new version of the `git` gem requires these steps:
 
 - [How to release a new git.gem](#how-to-release-a-new-gitgem)
-  - [Prepare the release](#prepare-the-release)
-  - [Create a GitHub release](#create-a-github-release)
-  - [Build and release the gem](#build-and-release-the-gem)
-
-These instructions use an example where the current release version is `1.5.0`
-and the new release version to be created is `1.6.0.pre1`.
-
-## Prepare the release
-
-From a fork of ruby-git, create a PR containing changes to (1) bump the
-version number, (2) update the CHANGELOG.md, and (3) tag the release.
-
-- Bump the version number in lib/git/version.rb following [Semantic Versioning](https://semver.org)
-  guidelines
-- Add a link in CHANGELOG.md to the release tag which will be created later
-  in this guide
-- Create a new tag using [git-extras](https://github.com/tj/git-extras/blob/master/Commands.md#git-release)
-  `git release` command
-  - For example: `git release v1.6.0.pre1`
-- These should be the only changes in the PR
-- An example of these changes for `v1.6.0.pre1` can be found in [PR #435](https://github.com/ruby-git/ruby-git/pull/435)
-- Get the PR reviewed, approved and merged to master.
-
-## Create a GitHub release
-
-On [the ruby-git releases page](https://github.com/ruby-git/ruby-git/releases),
-select `Draft a new release`
-
-- Select the tag corresponding to the version being released `v1.6.0.pre1`
-- The Target should be `master`
-- For the release description, use the output of [changelog-rs](https://github.com/perlun/changelog-rs)
-  - A Docker image is provided in [Dockerfile.changelog-rs](https://github.com/ruby-git/ruby-git/blob/master/Dockerfile.changelog-rs)
-    so you don't have to install changelog-rs or the Rust tool chain. To build the
-    Docker image, run this command from this project's root directory:
-    - `docker build --file Dockerfile.changelog-rs --tag changelog-rs .`
-  - To run the changelog-rs command using this image, run the following command
-    from this project's root directory (replace the tag names appropriate for the
-    current release):
-    - `docker run --rm --volume "$PWD:/worktree" changelog-rs v1.5.0 v1.6.0.pre1`
-  - Copy the output, omitting the tag header `## v1.6.0.pre1` and paste into
-    the release description
-  - The release description can be edited later if needed
-- Select the appropriate value for `This is a pre-release`
-  - Since `v1.6.0.pre1` is a pre-release, check `This is a pre-release`
-
-## Build and release the gem
-
-Clone [ruby-git/ruby-git](https://github.com/ruby-git/ruby-git) directly (not a
-fork) and ensure your local working copy is on the master branch
-
-- Verify that you are not on a fork with the command `git remote -v`
-- Verify that the version number is correct by running `rake -T` and inspecting
-  the output for the `release[remote]` task
-
-Build the git gem and push it to rubygems.org with the command `rake release`
-
-- Ensure that your `gem sources list` includes `https://rubygems.org` (in my
-  case, I usually have my work’s internal gem repository listed)
+  - [Install Prerequisites](#install-prerequisites)
+  - [Prepare the Release](#prepare-the-release)
+  - [Review and Merge the Release](#review-and-merge-the-release)
+  - [Build and Release the Gem](#build-and-release-the-gem)
+
+These instructions use an example where:
+
+- The default branch is `master`
+- The current release version is `1.5.0`
+- You want to create a new *minor* release, `1.6.0`
+
+## Install Prerequisites
+
+The following tools need to be installed in order to create the release:
+
+- [git](https://git-scm.com) is used to interact with the local and remote repositories
+- [gh](https://cli.github.com) is used to create the release and PR in GitHub
+- [Docker](https://www.docker.com) is used to run the script to create the release notes
+
+On a Mac, these tools can be installed using [brew](https://brew.sh):
+
+```shell
+$ brew install git
+...
+$ brew install gh
+...
+$ brew install --cask docker
+...
+$
+```
+
+## Prepare the Release
+
+Bump the version, create release notes, tag the release and create a GitHub release and PR which can be used to review the release.
+
+Steps:
+
+- Check out the code with `git clone https://github.com/ruby-git/ruby-git ruby-git-v1.6.0 && cd ruby-git-v1.6.0`
+- Install development dependencies using bundle `bundle install`
+- Based upon the nature of the changes, decide on the type of release: `major`, `minor`, or `patch` (in this example we will use `minor`)
+- Run the release script `bundle exec create-github-release minor`
+
+## Review and Merge the Release
+
+Have the release PR approved and merge the changes into the `master` branch.
+
+**IMPORTANT** DO NOT merge to the `master` branch using the GitHub UI. Instead use the instructions below.
+
+Steps:
+
+- Get the release PR reviewed and approved in GitHub
+- Merge the changes with the command `git checkout master && git merge --ff-only v1.6.0 && git push`
+
+## Build and Release the Gem
+
+Build the gem and publish it to [rubygems.org](https://rubygems.org/gems/git)
+
+Steps:
+
+- Build and release the gem using rake `bundle exec rake release`

data/git.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rchardet', '~> 1.8'
 
   s.add_development_dependency 'bump', '~> 0.10'
+  s.add_development_dependency 'create_github_release', '~> 0.2'
   s.add_development_dependency 'minitar', '~> 0.9'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'test-unit', '~> 3.3'

data/lib/git/lib.rb

@@ -486,7 +486,9 @@ module Git
       command_lines('ls-files', '--stage', location).each do |line|
         (info, file) = line.split("\t")
         (mode, sha, stage) = info.split
-        file = eval(file) if file =~ /^\".*\"$/ # This takes care of quoted strings returned from git
+        if file.start_with?('"') && file.end_with?('"')
+          file = Git::EscapedPath.new(file[1..-2]).unescape
+        end
         hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
       end
       hsh
@@ -762,11 +764,21 @@ module Git
       command('branch', '-D', branch)
     end
 
+    # Runs checkout command to checkout or create branch
+    #
+    # accepts options:
+    #  :new_branch
+    #  :force
+    #  :start_point
+    #
+    # @param [String] branch
+    # @param [Hash] opts
     def checkout(branch, opts = {})
       arr_opts = []
       arr_opts << '-b' if opts[:new_branch] || opts[:b]
       arr_opts << '--force' if opts[:force] || opts[:f]
       arr_opts << branch
+      arr_opts << opts[:start_point] if opts[:start_point] && arr_opts.include?('-b')
 
       command('checkout', arr_opts)
     end
@@ -1015,8 +1027,9 @@ module Git
     # returns the current version of git, as an Array of Fixnums.
     def current_command_version
       output = command('version')
-      version = output[/\d+\.\d+(\.\d+)+/]
-      version.split('.').collect {|i| i.to_i}
+      version = output[/\d+(\.\d+)+/]
+      version_parts = version.split('.').collect { |i| i.to_i }
+      version_parts.fill(0, version_parts.length...3)
     end
 
     def required_command_version
@@ -1027,6 +1040,14 @@ module Git
       (self.current_command_version <=>  self.required_command_version) >= 0
     end
 
+    def self.warn_if_old_command(lib)
+      return true if @version_checked
+      @version_checked = true
+      unless lib.meets_required_version?
+        $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
+      end
+      true
+    end
 
     private
 
@@ -1083,6 +1104,8 @@ module Git
     end
 
     def command(cmd, *opts, &block)
+      Git::Lib.warn_if_old_command(self)
+
       command_opts = { chomp: true, redirect: '' }
       if opts.last.is_a?(Hash)
         command_opts.merge!(opts.pop)

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.12.0'
+  VERSION='1.13.1'
 end

data/lib/git.rb

@@ -27,11 +27,6 @@ require 'git/working_directory'
 require 'git/worktree'
 require 'git/worktrees'
 
-lib = Git::Lib.new(nil, nil)
-unless lib.meets_required_version?
-  $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
-end
-
 # The Git module provides the basic functions to open a git
 # reference to work with. You can open a working directory,
 # open a bare repository, initialize a new repo or clone an

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: create_github_release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories