Merge branch 'master' into feature/default_branch

jcouball · web-flow · commit f6a5cb2ac729 · 2021-12-17T14:35:28.000-08:00
diff --git a/lib/git.rb b/lib/git.rb
@@ -212,6 +212,9 @@ def self.global_config(name = nil, value = nil)
   #   `"#{directory}/.git"`, create a bare repository at `"#{directory}"`.
   #   See [what is a bare repository?](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbarerepositoryabarerepository).
   #
+  # @option options [String] :initial_branch Use the specified name for the
+  #   initial branch in the newly created repository.
+  #
   # @option options [Pathname] :repository the path to put the newly initialized
   #   Git repository. The default for non-bare repository is `"#{directory}/.git"`.
   #
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -34,7 +34,10 @@ def self.init(directory, options = {})
 
       FileUtils.mkdir_p(options[:working_directory]) if options[:working_directory] && !File.directory?(options[:working_directory])
 
-      init_options = { :bare => options[:bare] }
+      init_options = {
+        :bare => options[:bare],
+        :initial_branch => options[:initial_branch],
+      }
 
       options.delete(:working_directory) if options[:bare]
 
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -71,10 +71,12 @@ def initialize(base = nil, logger = nil)
     # options:
     #   :bare
     #   :working_directory
+    #   :initial_branch
     #
     def init(opts={})
       arr_opts = []
       arr_opts << '--bare' if opts[:bare]
+      arr_opts << "--initial-branch=#{opts[:initial_branch]}" if opts[:initial_branch]
 
       command('init', arr_opts)
     end
@@ -786,6 +788,7 @@ def checkout_file(version, file)
 
     def merge(branch, message = nil, opts = {})
       arr_opts = []
+      arr_opts << '--no-commit' if opts[:no_commit]
       arr_opts << '--no-ff' if opts[:no_ff]
       arr_opts << '-m' << message if message
       arr_opts += [branch]
@@ -893,6 +896,7 @@ def fetch(remote, opts)
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
       arr_opts << '--unshallow' if opts[:unshallow]
+      arr_opts << '--depth' << opts[:depth] if opts[:depth]
 
       command('fetch', arr_opts)
     end
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
@@ -38,6 +38,7 @@ def test_git_init
       assert(File.directory?(File.join(path, '.git')))
       assert(File.exist?(File.join(path, '.git', 'config')))
       assert_equal('false', repo.config('core.bare'))
+      assert_equal("ref: refs/heads/master\n", File.read("#{path}/.git/HEAD"))
     end
   end
 
@@ -61,6 +62,16 @@ def test_git_init_remote_git
     end
   end
 
+  def test_git_init_initial_branch
+    in_temp_dir do |path|
+      repo = Git.init(path, initial_branch: 'main')
+      assert(File.directory?(File.join(path, '.git')))
+      assert(File.exist?(File.join(path, '.git', 'config')))
+      assert_equal('false', repo.config('core.bare'))
+      assert_equal("ref: refs/heads/main\n", File.read("#{path}/.git/HEAD"))
+    end
+  end
+
   def test_git_clone
     in_temp_dir do |path|
       g = Git.clone(@wbare, 'bare-co')
diff --git a/tests/units/test_merge.rb b/tests/units/test_merge.rb
@@ -130,4 +130,33 @@ def test_no_ff_merge
       end
     end
   end
+
+  def test_merge_no_commit
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'branch_merge_test')
+      g.chdir do
+        g.branch('new_branch_1').in_branch('first commit message') do
+          new_file('new_file_1', 'foo')
+          g.add
+          true
+        end
+
+        g.branch('new_branch_2').in_branch('first commit message') do
+          new_file('new_file_2', 'bar')
+          g.add
+          true
+        end
+
+        g.checkout('new_branch_2')
+        before_merge = g.show
+        g.merge('new_branch_1', nil, no_commit: true)
+        # HEAD is the same as before.
+        assert_equal(before_merge, g.show)
+        # File has not been merged in.
+        status = g.status['new_file_1']
+        assert_equal('new_file_1', status.path)
+        assert_equal('A', status.type)
+      end
+    end
+  end
 end
diff --git a/tests/units/test_worktree.rb b/tests/units/test_worktree.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'fileutils'
+require 'pathname'
 require File.dirname(__FILE__) + '/../test_helper'
 
 SAMPLE_LAST_COMMIT = '5e53019b3238362144c2766f02a2c00d91fcc023'

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,9 @@ def self.global_config(name = nil, value = nil)`
`212`	`212`	# `"#{directory}/.git"`, create a bare repository at `"#{directory}"`.
`213`	`213`	`# See [what is a bare repository?](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbarerepositoryabarerepository).`
`214`	`214`	`#`
	`215`	`+ # @option options [String] :initial_branch Use the specified name for the`
	`216`	`+ # initial branch in the newly created repository.`
	`217`	`+ #`
`215`	`218`	`# @option options [Pathname] :repository the path to put the newly initialized`
`216`	`219`	# Git repository. The default for non-bare repository is `"#{directory}/.git"`.
`217`	`220`	`#`