summaryrefslogtreecommitdiff
path: root/lib/bundler/source/git
Commit message (Collapse)AuthorAgeFilesLines
* When running `bundle lock --update <name>`, checkout locked revision of ↵David Rodríguez2023-03-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | unrelated git sources directly Since Bundler 2.4, we will try to checkout any branch specified in the Gemfile, while until Bundler 2.3 we would directly checkout the locked revision. This should not make any difference in most situations, but in some edge cases, like if the branch specified in the `Gemfile` has been renamed, but the locked revision still exist, it causes an error now while before it would update the lockfile without issues. I debated which behavior was best, since I was not sure. But my conclusion is that if the situation does not require expiring the lockfile source in favor of the Gemfile source, we should use the locked revision directly and proceed happily. So I restored Bundler 2.3 behavior. I think this is consistent with how yanked gems are handled, for example. Of course, if explicitly updating the git source itself, or all gems, we will still get any errors like missing branches related to the git source.
* [rubygems/rubygems] Give a better message when Gemfile branch does not existDavid Rodríguez2023-02-211-4/+16
| | | | https://github.com/rubygems/rubygems/commit/cb4fc41cbc
* [rubygems/rubygems] Restore better error message when locked ref does not existDavid Rodríguez2023-02-211-4/+6
| | | | https://github.com/rubygems/rubygems/commit/c8e024359f
* Update Bundler to 2.4.1 & and RubyGems to 3.4.1David Rodríguez2022-12-251-14/+17
|
* Merge RubyGems-3.4.0 and Bundler-2.4.0Hiroshi SHIBATA2022-12-241-19/+14
|
* Merge RubyGems/Bundler masterHiroshi SHIBATA2022-12-201-29/+36
| | | | Pick from https://github.com/rubygems/rubygems/commit/ba3adad4d80038ffd7bea015da2f11d3e8a2ff82
* Merge RubyGems/Bundler masterHiroshi SHIBATA2022-12-151-21/+47
| | | | Pick from https://github.com/rubygems/rubygems/commit/084f7d1f21f6fc3e2bb685b7bda3653fb2891c6e
* Merge RubyGems/Bundler masterHiroshi SHIBATA2022-12-121-1/+1
| | | | from https://github.com/rubygems/rubygems/commit/bfb0ae69776069155d2092702bfbb5a12617d85a
* Merge RubyGems/Bundler masterHiroshi SHIBATA2022-12-091-36/+131
| | | | Pick from https://github.com/rubygems/rubygems/commit/823c776d951f3c35094611473ec77f94e8bf6610
* [rubygems/rubygems] Pass "--" to git commands to separate positional and ↵David Rodríguez2021-12-071-2/+2
| | | | | | | | | optional args To make sure git uri's specified in Gemfile are never misinterpreted as optional arguments, potentially allowing for local code execution. https://github.com/rubygems/rubygems/commit/90b1ed8b9f
* [rubygems/rubygems] Better error when installing a git lockfile and git not ↵David Rodríguez2021-10-301-2/+5
| | | | | | present https://github.com/rubygems/rubygems/commit/28f4842196
* [rubygems/rubygems] Lazily load shellwordsDavid Rodríguez2021-07-271-2/+1
| | | | https://github.com/rubygems/rubygems/commit/ef6388656a
* Sync latest development version of bundler & rubygemsDavid Rodríguez2021-03-081-17/+35
|
* Track Bundler master(2.3.0.dev) branch at ↵Hiroshi SHIBATA2021-01-041-40/+27
| | | | 55634a8af18a52df86c4275d70fa1179118bcc20
* Merge prepare version of Bundler 2.2.0Hiroshi SHIBATA2020-12-081-1/+1
|
* Merge bundler-2.2.0.rc.2Hiroshi SHIBATA2020-10-151-2/+4
|
* Update links from rubygems/bundler to rubygems/rubygemsJakob Krigovsky2020-06-051-1/+1
|
* Update the bundler version with master branchHiroshi SHIBATA2020-05-131-58/+53
|
* Prepare to release bundler-2.1.0Hiroshi SHIBATA2019-12-151-2/+3
|
* Merge Bundler 2.1.0.pre.3Hiroshi SHIBATA2019-11-111-1/+1
| | | | | | | | | | | | | | | Features: - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361) - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389) - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394) Bugfixes: - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374) - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385) - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388) - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393) - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416) - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)
* [bundler/bundler] Fix comments and messages to refer to https urlTakayuki Nakata2019-09-181-1/+1
| | | | https://github.com/bundler/bundler/commit/a86b49f1b9
* [bundler/bundler] Clearer MissingRevision git errorsDavid Rodríguez2019-08-031-7/+11
| | | | https://github.com/bundler/bundler/commit/b47d23edf5
* [bundler/bundler] Migrate git proxy helpers to use Open3David Rodríguez2019-08-031-30/+22
| | | | https://github.com/bundler/bundler/commit/4a37d66f3f
* Merge Bundler 2.1.0.pre.1 as developed version from upstream.hsbt2019-04-141-1/+1
| | | | | | https://github.com/bundler/bundler/commit/a53709556b95a914e874b22ed2116a46b0528852 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Added bundler as default gems. Revisit [Feature #12733]hsbt2018-11-021-0/+262
| | | | | | | | | | | * bin/*, lib/bundler/*, lib/bundler.rb, spec/bundler, man/*: Merge from latest stable branch of bundler/bundler repository and added workaround patches. I will backport them into upstream. * common.mk, defs/gmake.mk: Added `test-bundler` task for test suite of bundler. * tool/sync_default_gems.rb: Added sync task for bundler. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Postponing the Bundler merge.hsbt2017-12-221-257/+0
| | | | | | | I faced a big issue about Bundler with ruby core. I have no time to resolve it issue before 2.5 final release. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Update bundled bundler to 1.16.0.hsbt2017-11-011-10/+15
| | | | | | | * lib/bundler, spec/bundler: Merge bundler-1.16.0. * common.mk: rspec examples of bundler-1.16.0 needs require option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Merge bundler to standard libraries.hsbt2017-09-081-0/+252
rubygems 2.7.x depends bundler-1.15.x. This is preparation for rubygems and bundler migration. * lib/bundler.rb, lib/bundler/*: files of bundler-1.15.4 * spec/bundler/*: rspec examples of bundler-1.15.4. I applied patches. * https://github.com/bundler/bundler/pull/6007 * Exclude not working examples on ruby repository. * Fake ruby interpriter instead of installed ruby. * Makefile.in: Added test task named `test-bundler`. This task is only working macOS/linux yet. I'm going to support Windows environment later. * tool/sync_default_gems.rb: Added sync task for bundler. [Feature #12733][ruby-core:77172] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e