git 1.6.0.pre1 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of git might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 291adaa24da09656259518cf50d18882222a6704c742f70d266378a7c4d440cc
4
- data.tar.gz: 46639fb4a5542f2354d9713dd47adca9349fda39a8b0a6a1d739e830214a1c05
3
+ metadata.gz: 87d2d900d69f6d803a09dab4f7668b550bc21cecbf51194b494f8b9366dce3d7
4
+ data.tar.gz: f8c1dc4b41a65b7c562f496f78a7d0f9f8ad98f26b70588186b5a890f058873b
5
5
  SHA512:
6
- metadata.gz: 3bd0c914126e45b381671af36637e226817f7894164344c3abed242e3ba34a414290a9adceff25e7cc931be89192d17fe2510945d4391ffd35e994c79f71dab0
7
- data.tar.gz: e249b429712dd287389f13d59e09c344e372b6d77189fa3baf1b81b63126f93e8f71c752b90c0f1227aa5d374efed4ee5aa572aca55832276c13ed1e86ddaee7
6
+ metadata.gz: 9c4364cfc57fd1eb54be4c5229ca0b14b4d83227d08fabb57e0c326dee91be43bb1560376f013965f2377f651ad64900b5bd90ff96737855d8acdcb87cef7ac2
7
+ data.tar.gz: 1d1114b7f1a2af9964e57e5cac34c8c88ffddebb39f79cdad89023827a3863697db435055c08961653a7a82c6cdf9f983e6c3b4119002c75b5f263acf2830e3e
@@ -1,5 +1,9 @@
1
1
  # Change Log
2
2
 
3
+ ## 1.6.0
4
+
5
+ See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0
6
+
3
7
  ## 1.6.0.pre1
4
8
 
5
9
  See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0.pre1
@@ -1,68 +1,118 @@
1
1
  # Contributing to ruby-git
2
2
 
3
- Thank you for your interest in contributing to this project.
3
+ Thank you for your interest in contributing to the ruby-git project.
4
4
 
5
- These are mostly guidelines, not rules.
6
- Use your best judgment, and feel free to propose changes to this document in a pull request.
5
+ This document gives the guidelines for contributing to the ruby-git project.
6
+ These guidelines may not fit every situation. When contributing use your best
7
+ judgement.
7
8
 
8
- #### Table Of Contents
9
+ Propose changes to these guidelines with a pull request.
9
10
 
10
- [How Can I Contribute?](#how-can-i-contribute)
11
- * [Submitting Issues](#submitting-issues)
12
- * [Contribution Process](#contribution-process)
13
- * [Pull Request Requirements](#pull-request-requirements)
14
- * [Code Review Process](#code-review-process)
15
- * [Developer Certification of Origin (DCO)](#developer-certification-of-origin-dco)
11
+ ## How to contribute to ruby-git
16
12
 
13
+ You can contribute in two ways:
17
14
 
18
- ## How Can I Contribute?
15
+ 1. [Report an issue or make a feature request](#how-to-report-an-issue-or-make-a-feature-request)
16
+ 2. [Submit a code or documentation change](#how-to-submit-a-code-or-documentation-change)
19
17
 
20
- ### Submitting Issues
18
+ ## How to report an issue or make a feature request
21
19
 
22
- We utilize **GitHub Issues** for issue tracking and contributions. You can contribute in two ways:
20
+ ruby-git utilizes [GitHub Issues](https://help.github.com/en/github/managing-your-work-on-github/about-issues)
21
+ for issue tracking and feature requests.
23
22
 
24
- 1. Reporting an issue or making a feature request [here](https://github.com/ruby-git/ruby-git/issues/new).
25
- 2. Adding features or fixing bugs yourself and contributing your code to ruby-git.
23
+ Report an issue or feature request by [creating a ruby-git Github issue](https://github.com/ruby-git/ruby-git/issues/new).
24
+ Fill in the template to describe the issue or feature request the best you can.
26
25
 
27
- ### Contribution Process
26
+ ## How to submit a code or documentation change
28
27
 
29
- We have a 3 step process for contributions:
28
+ There is three step process for code or documentation changes:
30
29
 
31
- 1. Commit changes to a git branch in your fork. Making sure to sign-off those changes for the [Developer Certificate of Origin](#developer-certification-of-origin-dco).
32
- 2. Create a GitHub Pull Request for your change, following the instructions in the pull request template.
33
- 3. Perform a [Code Review](#code-review-process) with the project maintainers on the pull request.
30
+ 1. [Commit your changes to a fork of ruby-git](#commit-changes-to-a-fork-of-ruby-git)
31
+ 2. [Create a pull request](#create-a-pull-request)
32
+ 3. [Get your pull request reviewed](#get-your-pull-request-reviewed)
34
33
 
35
- ### Pull Request Requirements
36
- In order to ensure high quality, we require that all pull requests to this project meet these specifications:
34
+ ### Commit changes to a fork of ruby-git
37
35
 
38
- 1. Unit Testing: We require all the new code to include unit tests, and any fixes to pass previous units.
39
- 2. Green CI Tests: We are using [Travis CI](https://travis-ci.org/ruby-git/ruby-git) to run unit tests on various ruby versions, we expect them to all pass before a pull request will be merged.
40
- 3. Up-to-date Documentation: New methods as well as updated methods should have [YARD](https://yardoc.org/) documentation added to them
36
+ Make your changes in a fork of the ruby-git repository.
41
37
 
42
- ### Code Review Process
38
+ Each commit must include a [DCO sign-off](#developer-certificate-of-origin-dco)
39
+ by adding the line `Signed-off-by: Name <email>` to the end of the commit
40
+ message.
43
41
 
44
- Code review takes place in GitHub pull requests. See [this article](https://help.github.com/articles/about-pull-requests/) if you're not familiar with GitHub Pull Requests.
42
+ ### Create a pull request
45
43
 
46
- Once you open a pull request, project maintainers will review your code and respond to your pull request with any feedback they might have.
44
+ See [this article](https://help.github.com/articles/about-pull-requests/) if you
45
+ are not familiar with GitHub Pull Requests.
47
46
 
48
- The process at this point is as follows:
47
+ Follow the instructions in the pull request template.
49
48
 
50
- 1. One thumbs-up (:+1:) is required from project maintainers. See the master maintainers document for the ruby-git project at <https://github.com/ruby-git/ruby-git/blob/master/MAINTAINERS.md>.
51
- 2. When ready, your pull request will be merged into `master`, we may require you to rebase your PR to the latest `master`.
49
+ ### Get your pull request reviewed
52
50
 
53
- ### Developer Certification of Origin (DCO)
51
+ Code review takes place in a GitHub pull request using the [the Github pull request review feature](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews).
54
52
 
55
- Licensing is very important to open source projects. It helps ensure the software continues to be available under the terms that the author desired.
53
+ Once your pull request is ready for review, request a review from at least one
54
+ [maintainer](MAINTAINERS.md) and any number of other contributors.
56
55
 
57
- ruby-git uses [the MIT license](https://github.com/ruby-git/ruby-git/blob/master/LICENSE)
56
+ During the review process, you may need to make additional commits which would
57
+ need to be squashed. It may also be necessary to rebase to master again if other
58
+ changes are merged before your PR.
58
59
 
59
- Detail about the LICENSE can be found [here](https://choosealicense.com/licenses/mit/)
60
+ At least one approval is required from a project maintainer before your pull
61
+ request can be merged. The maintainer is responsible for ensuring that the pull
62
+ request meets [the project's coding standards](#coding-standards).
60
63
 
61
- To make a good faith effort to ensure these criteria are met, ruby-git requires the Developer Certificate of Origin (DCO) process to be followed.
64
+ ## Coding standards
62
65
 
63
- The DCO is an attestation attached to every contribution made by every developer.
66
+ In order to ensure high quality, all pull requests must meet these requirements:
64
67
 
65
- In the commit message of the contribution, the developer simply adds a Signed-off-by statement and thereby agrees to the DCO, which you can find below or at <http://developercertificate.org/>.
68
+ ### 1 PR = 1 Commit
69
+ * All commits for a PR must be squashed into one commit
70
+ * To avoid an extra merge commit, the PR must be able to be merged as [a fast forward merge](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
71
+ * The easiest way to ensure a fast forward merge is to rebase your local branch
72
+ to the ruby-git master branch
73
+
74
+ ### Unit tests
75
+ * All changes must be accompanied by new or modified unit tests
76
+ * The entire test suite must pass when `bundle exec rake test` is run from the
77
+ project's local working copy
78
+
79
+ ### Continuous Integration
80
+ * All tests must pass in the project's [Travis CI](https://travis-ci.org/ruby-git/ruby-git)
81
+ build before the pull request will be merged
82
+
83
+ ### Documentation
84
+ * New and updated public methods must have [YARD](https://yardoc.org/)
85
+ documentation added to them
86
+ * New and updated public facing features should be documented in the project's
87
+ [README.md](README.md)
88
+
89
+ ### Licensing sign-off
90
+ * Each commit must contain [the DCO sign-off](#developer-certificate-of-origin-dco)
91
+ in the form: `Signed-off-by: Name <email>`
92
+
93
+ ## Licensing
94
+
95
+ ruby-git uses [the MIT license](https://choosealicense.com/licenses/mit/) as
96
+ declared in the [LICENSE](LICENSE) file.
97
+
98
+ Licensing is very important to open source projects. It helps ensure the
99
+ software continues to be available under the terms that the author desired.
100
+
101
+ ### Developer Certificate of Origin (DCO)
102
+
103
+ This project requires that authors have permission to submit their contributions
104
+ under the MIT license. To make a good faith effort to ensure this, ruby-git
105
+ requires the [Developer Certificate of Origin (DCO)](https://elinux.org/Developer_Certificate_Of_Origin)
106
+ process be followed.
107
+
108
+ This process requires that each commit include a `Signed-off-by` line that
109
+ indicates the author accepts the DCO. Here is an example DCO sign-off line:
110
+
111
+ ```
112
+ Signed-off-by: John Doe <john.doe@hisdomain.com>
113
+ ```
114
+
115
+ The full text of the DCO version 1.1 is below or at <http://developercertificate.org/>.
66
116
 
67
117
  ```
68
118
  Developer's Certificate of Origin 1.1
@@ -75,7 +125,7 @@ By making a contribution to this project, I certify that:
75
125
 
76
126
  (b) The contribution is based upon previous work that, to the
77
127
  best of my knowledge, is covered under an appropriate open
78
- source license and I have the right under that license to
128
+ source license and I have the right under that license to
79
129
  submit that work with modifications, whether created in whole
80
130
  or in part by me, under the same open source license (unless
81
131
  I am permitted to submit under a different license), as
@@ -1,8 +1,9 @@
1
1
  # Maintainers
2
2
 
3
- When making changes to the system, this file tells you who needs to review your patch - you need at least two maintainers to provide a :+1: on your pull request.
3
+ When making changes in this repository, one of the maintainers below must review and approve your pull request.
4
4
 
5
5
  ### Maintainers
6
6
 
7
7
  * [Per Lundberg](https://github.com/perlun)
8
- * [Vern Burton](https://github.com/tarcinil)
8
+ * [Vern Burton](https://github.com/tarcinil)
9
+ * [James Couball](https://github.com/jcouball)
data/lib/git.rb CHANGED
@@ -19,6 +19,7 @@ require 'git/repository'
19
19
  require 'git/status'
20
20
  require 'git/stash'
21
21
  require 'git/stashes'
22
+ require 'git/version'
22
23
  require 'git/working_directory'
23
24
 
24
25
  lib = Git::Lib.new(nil, nil)
@@ -34,7 +35,7 @@ end
34
35
  # and more. You should be able to do most fundamental git
35
36
  # operations with this library.
36
37
  #
37
- # This module provides the basic functions to open a git
38
+ # This module provides the basic functions to open a git
38
39
  # reference to work with. You can open a working directory,
39
40
  # open a bare repository, initialize a new repo or clone an
40
41
  # existing remote repository.
@@ -42,7 +43,7 @@ end
42
43
  # Author:: Scott Chacon (mailto:schacon@gmail.com)
43
44
  # License:: MIT License
44
45
  module Git
45
-
46
+
46
47
  #g.config('user.name', 'Scott Chacon') # sets value
47
48
  #g.config('user.email', 'email@email.com') # sets value
48
49
  #g.config('user.name') # returns 'Scott Chacon'
@@ -82,7 +83,7 @@ module Git
82
83
  def self.bare(git_dir, options = {})
83
84
  Base.bare(git_dir, options)
84
85
  end
85
-
86
+
86
87
  # clones a remote repository
87
88
  #
88
89
  # options
@@ -110,7 +111,7 @@ module Git
110
111
  repo.checkout("origin/#{options[:branch]}") if options[:branch]
111
112
  Dir.chdir(repo.dir.to_s) { FileUtils.rm_r '.git' }
112
113
  end
113
-
114
+
114
115
  # Same as g.config, but forces it to be at the global level
115
116
  #
116
117
  #g.config('user.name', 'Scott Chacon') # sets value
@@ -139,8 +140,8 @@ module Git
139
140
  def self.init(working_dir = '.', options = {})
140
141
  Base.init(working_dir, options)
141
142
  end
142
-
143
- # returns a Hash containing information about the references
143
+
144
+ # returns a Hash containing information about the references
144
145
  # of the target repository
145
146
  #
146
147
  # @param [String|NilClass] location the target repository location or nil for '.'
@@ -150,7 +151,7 @@ module Git
150
151
  end
151
152
 
152
153
  # open an existing git working directory
153
- #
154
+ #
154
155
  # this will most likely be the most common way to create
155
156
  # a git reference, referring to a working directory.
156
157
  # if not provided in the options, the library will assume
@@ -162,5 +163,5 @@ module Git
162
163
  def self.open(working_dir, options = {})
163
164
  Base.open(working_dir, options)
164
165
  end
165
-
166
+
166
167
  end
@@ -37,7 +37,7 @@ module Git
37
37
  # # do other stuff
38
38
  # return true # auto commits and switches back
39
39
  # end
40
- def in_branch (message = 'in branch work')
40
+ def in_branch(message = 'in branch work')
41
41
  old_current = @base.lib.branch_current
42
42
  checkout
43
43
  if yield
@@ -1,5 +1,5 @@
1
1
  module Git
2
2
  # The current gem version
3
3
  # @return [String] the current gem version.
4
- VERSION='1.6.0.pre1'
4
+ VERSION='1.6.0'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0.pre1
4
+ version: 1.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon and others
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-20 00:00:00.000000000 Z
11
+ date: 2020-02-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rchardet