braid 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb13d280f397cd42919d311d849056087324f1ffec5c57f7b126b82013048f9
-  data.tar.gz: cfb5432addac3a9167f3e8f61bed948cc2651af2a84d32d3984194759fcc1ee7
+  metadata.gz: 820284531c81fc3d920345ddca21afa6cb6f49489aa088c2eb6b3233923069e9
+  data.tar.gz: ee5eb584e64c6426e77905bc1d8ac7d1622620665749546bf142c424dacf027e
 SHA512:
-  metadata.gz: a4e725e85c4b487409575d530aa012c4cd5a3e1b90b71e14e09fd100bbdd7ee5fd3c11afde95548436df35a0286c105121953578af5cca2470c9674b68d60d59
-  data.tar.gz: 73ac1fc248da08c36d9b3fe5e77a12bdbda4f858efe48951a697ec352ea9e29422e3f4931001b6c2f729a9a91fb4679196cc1293eb5f01ab96bb91999412cc3f
+  metadata.gz: 71b869dfd6f57e8d64238b7d09761415d807572cd2d2b71e8f0d0a3fb48d759af2269f0ba13a946142408981b8edb3d84c8f00cca51ed1542fcf0a785e5c38f4
+  data.tar.gz: fe09b15e8062fab7aa8389dddc9bae1c4f684e583bed5ac3105970fe7ad6d809b5af9583cf6c970563a8471317a78cfac505522f3402403b7d547aba087a613c

data/lib/braid/operations.rb

@@ -62,7 +62,7 @@ module Braid
       # hax!
       def version
         status, out, err = exec!("#{self.class.command} --version")
-        out.sub(/^.* version/, '').strip
+        out.sub(/^.* version/, '').strip.sub(/ .*$/, '').strip
       end
 
       def require_version(required)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
 end

data/spec/integration/integration_helper.rb

@@ -93,7 +93,7 @@ end
 # bunch of dependencies from Braid::Operations.  This small amount of code
 # duplication seems like a lesser evil than sorting out all the dependencies.
 def git_require_version(required)
-  actual = run_command('git --version').sub(/^.* version/, '').strip
+  actual = run_command('git --version').sub(/^.* version/, '').strip.sub(/ .*$/, '').strip
   Gem::Version.new(actual) >= Gem::Version.new(required)
 end
 
@@ -111,10 +111,13 @@ def create_git_repo_from_fixture(fixture_name, options = {})
   update_dir_from_fixture(directory, fixture_name)
 
   in_dir(git_repo) do
-    # Avoid a warning emitted by because we use the old default default branch name
-    run_command('git config --global init.defaultBranch master')
-
-    run_command('git init')
+    # If we don't specify the initial branch name, Git >= 2.30 warns that the
+    # default of `master` is subject to change.  We're still using `master` for
+    # now, so avoid the warning by specifying it explicitly.  Git >= 2.28 honors
+    # init.defaultBranch, while older versions of Git ignore it and are
+    # hard-coded to use `master`.  (Using the `--initial-branch=master` option
+    # would cause an error on Git < 2.28, so we don't do that.)
+    run_command('git -c init.defaultBranch=master init')
     run_command("git config --local user.email \"#{email}\"")
     run_command("git config --local user.name \"#{name}\"")
     run_command('git config --local commit.gpgsign false')

data/spec/integration/push_spec.rb

@@ -342,9 +342,6 @@ describe 'Pushing to a mirror' do
       # the filter until after that step. :/
       @vendor_repository_dir = create_git_repo_from_fixture('skit1_with_filter')
 
-      # Avoid a warning emitted by because we use the old default default branch name
-      run_command('git config --global init.defaultBranch master')
-
       # Configure the broken filter globally.  Here, `false` is the command that
       # always exits 1.
       run_command('git config --global filter.broken.clean false')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Cristi Balan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main