gitx 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d276a1d2a8560dbb235b82b3c85b086fde5bf1b082f204b9f49775b20f77489
-  data.tar.gz: b0b5a42771c92360458ba3c374cecac1d333aa2d34fb51c6c30a3962cc1d9812
+  metadata.gz: '03690d88d3a570105068b4795d6df494ce8a1c6e5335ba88cb0171247ee0d428'
+  data.tar.gz: 05cb9b78bc92596c00f32fac7954a58b79355c242480a49cde64aabfc7904498
 SHA512:
-  metadata.gz: d44543c6d8c06a11cce788c19e90f3e1aa1497ff87eebdc7d7e88f00b805f38e8a1d005e87008d945c3df0e67fa199e8a39106cb091285eae61598f89d1400ed
-  data.tar.gz: 0a8f2e1a5f7a725556f97ebad9390f1d1c16a5668cb3812654621acf5ee7fd505ebe4dd0070665fb53e9ca142b93e3a5adea14b0b0bfc0a923b985b7b5760bbd
+  metadata.gz: 5de1a2c9142582d602a31c9bfec9c5a04e9af4796f6c9ad6bfb5dc7f7cf742c8c8db487fe82e3f93c663fb19184aaefe853e24a071e5cfd378edb49b36c8c614
+  data.tar.gz: 981d58e0239954665d5387a289891bd7bce094cce3afbeeb4ee223a3273c1d55090e33ce590db34221a72d92d92ad0829a05d22c781bc5874ee7f553747d49b3

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+3.3.0

data/README.md

@@ -77,6 +77,10 @@ options:
 * `--branch` = configure the branch name related to the build tag
 * `--message` = configure the git message associated to the tag
 
+## Authentication
+
+In order to access any of the Github APIs you will need to generate [a Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) with `repo` scopes. You will be prompted for this token before gitx accesses the Github API. After you provide the token it will be saved in `~/.config/gitx.yml` so you don't need to provide it again.
+
 ## Configuration
 Any of the [default settings defined in the gem](lib/gitx/defaults.yml) can be overridden
 by creating a custom `.gitx.yml` file in the root directory of your project.

data/lib/gitx/cli/cleanup_command.rb

@@ -22,7 +22,7 @@ module Gitx
 
       def update_base_branch
         checkout_branch config.base_branch
-        run_git_cmd 'pull'
+        run_git_cmd 'pull', '--no-rebase'
         run_git_cmd 'remote', 'prune', 'origin'
       end
 

data/lib/gitx/cli/release_command.rb

@@ -50,7 +50,7 @@ module Gitx
           return unless confirm_branch_status?(branch)
 
           checkout_branch config.base_branch
-          run_git_cmd 'pull', 'origin', config.base_branch
+          run_git_cmd 'pull', 'origin', config.base_branch, '--no-rebase'
           run_git_cmd 'merge', '--no-ff', '--message', commit_message(branch, pull_request), branch
           run_git_cmd 'push', 'origin', 'HEAD'
         end

data/lib/gitx/cli/start_command.rb

@@ -14,7 +14,7 @@ module Gitx
         branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})") until valid_new_branch_name?(branch_name)
 
         checkout_branch config.base_branch
-        run_git_cmd 'pull'
+        run_git_cmd 'pull', '--no-rebase'
         repo.create_branch branch_name, config.base_branch
         checkout_branch branch_name
         run_git_cmd('commit', '--allow-empty', '--message', commit_message(branch_name))

data/lib/gitx/cli/update_command.rb

@@ -29,7 +29,7 @@ module Gitx
       end
 
       def update_branch(branch, repository: 'origin')
-        run_git_cmd 'pull', repository, branch
+        run_git_cmd 'pull', repository, branch, '--no-rebase'
       rescue Gitx::Executor::ExecutionError
         raise MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command'
       end

data/lib/gitx/github.rb

@@ -108,28 +108,15 @@ module Gitx
     def authorization_token
       auth_token = ENV['GITX_GITHUB_TOKEN'] || global_config['token']
       auth_token ||= begin
-        new_token = create_authorization
+        new_token = fetch_token
         save_global_config('token' => new_token)
         new_token
       end
       auth_token
     end
 
-    def create_authorization
-      password = ask_without_echo("Github password for #{username}: ")
-      client = Octokit::Client.new(login: username, password: password)
-      options = {
-        scopes: ['repo'],
-        note: github_client_name,
-        note_url: CLIENT_URL
-      }
-      two_factor_auth_token = ask_without_echo('Github two factor authorization token (if enabled): ')
-      options[:headers] = { 'X-GitHub-OTP' => two_factor_auth_token } if two_factor_auth_token
-      response = client.create_authorization(options)
-      response.token
-    rescue Octokit::ClientError => e
-      say "Error creating authorization: #{e.message}", :red
-      retry
+    def fetch_token
+      ask_without_echo("Github personal access token with repo scopes for #{username}: ")
     end
 
     def github_client_name

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '4.4.0'.freeze
+  VERSION = '4.5.0'.freeze
 end

data/spec/gitx/cli/cleanup_command_spec.rb

@@ -39,7 +39,7 @@ describe Gitx::Cli::CleanupCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', 'merged-local-feature').ordered
 
@@ -59,7 +59,7 @@ describe Gitx::Cli::CleanupCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature').ordered
 
@@ -79,7 +79,7 @@ describe Gitx::Cli::CleanupCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature/review').ordered
 
@@ -102,7 +102,7 @@ describe Gitx::Cli::CleanupCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', base_branch).ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to_not receive(:execute).with('git', 'push', 'origin', '--delete', base_branch)
 

data/spec/gitx/cli/release_command_spec.rb

@@ -42,7 +42,7 @@ describe Gitx::Cli::ReleaseCommand do
 
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to_not receive(:execute).with('git', 'checkout', 'main')
-        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase')
         expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch')
         expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD')
 
@@ -65,7 +65,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
@@ -95,7 +95,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('echo hello').ordered
@@ -118,7 +118,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
@@ -156,7 +156,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return('2013-01-01 did some stuff').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
@@ -188,7 +188,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
@@ -219,7 +219,7 @@ describe Gitx::Cli::ReleaseCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
         expect(executor).to_not receive(:execute).with('git', 'checkout', 'main')
-        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase')
         expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch')
         expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD')
 
@@ -254,7 +254,7 @@ describe Gitx::Cli::ReleaseCommand do
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
         expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered

data/spec/gitx/cli/review_command_spec.rb

@@ -293,48 +293,16 @@ describe Gitx::Cli::ReviewCommand do
           'github.user' => 'ryan@codecrate.com'
         }
       end
-      let(:github_password) { 'secretz' }
-      let(:authorization_token) { '123981239123' }
+      let(:github_personal_access_token) { 'secretz' }
       before do
-        stub_request(:post, 'https://api.github.com/authorizations')
-          .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
-          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
-
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password)
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(nil)
+        expect(cli).to receive(:ask).with('Github personal access token for ryan@codecrate.com: ', echo: false).and_return(github_personal_access_token)
 
         @auth_token = cli.send(:authorization_token)
       end
       it 'stores authorization_token in global config' do
-        expect(global_config).to include('token' => authorization_token)
+        expect(global_config).to include('token' => github_personal_access_token)
       end
-      it { expect(@auth_token).to eq authorization_token }
-    end
-    context 'when global authorization_token is nil and first request fails' do
-      let(:repo_config) do
-        {
-          'remote.origin.url' => 'https://github.com/wireframe/gitx',
-          'github.user' => 'ryan@codecrate.com'
-        }
-      end
-      let(:github_password) { 'secretz' }
-      let(:authorization_token) { '123981239123' }
-      before do
-        stub_request(:post, 'https://api.github.com/authorizations')
-          .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
-          .to_return(status: 401, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
-          .then
-          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
-
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password).twice
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(nil).twice
-
-        @auth_token = cli.send(:authorization_token)
-      end
-      it 'stores authorization_token in global config' do
-        expect(global_config).to include('token' => authorization_token)
-      end
-      it { expect(@auth_token).to eq authorization_token }
+      it { expect(@auth_token).to eq github_personal_access_token }
     end
     context 'when the global config has an existing token' do
       let(:authorization_token) { '123981239123' }
@@ -357,31 +325,5 @@ describe Gitx::Cli::ReviewCommand do
       end
       it { expect(@auth_token).to eq authorization_token }
     end
-    context 'when two factor authorization token given' do
-      let(:repo_config) do
-        {
-          'remote.origin.url' => 'https://github.com/wireframe/gitx',
-          'github.user' => 'ryan@codecrate.com'
-        }
-      end
-      let(:github_password) { 'secretz' }
-      let(:authorization_token) { '123981239123' }
-      let(:two_factor_auth_token) { '456456' }
-      before do
-        stub_request(:post, 'https://api.github.com/authorizations')
-          .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
-          .with(headers: { 'X-GitHub-OTP' => two_factor_auth_token })
-          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
-
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password)
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(two_factor_auth_token)
-
-        @auth_token = cli.send(:authorization_token)
-      end
-      it 'stores authorization_token in global config' do
-        expect(global_config).to include('token' => authorization_token)
-      end
-      it { expect(@auth_token).to eq authorization_token }
-    end
   end
 end

data/spec/gitx/cli/start_command_spec.rb

@@ -17,7 +17,7 @@ describe Gitx::Cli::StartCommand do
     context 'when user inputs branch that is valid' do
       before do
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
@@ -31,7 +31,7 @@ describe Gitx::Cli::StartCommand do
     context 'when user inputs branch with slash' do
       before do
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('foo/ryan', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('foo/ryan').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on foo/ryan').ordered
@@ -47,7 +47,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
@@ -63,7 +63,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
@@ -82,7 +82,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
@@ -101,7 +101,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
@@ -120,7 +120,7 @@ describe Gitx::Cli::StartCommand do
       end
       before do
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', "[gitx] Start work on new-branch\n\nConnected to #10").ordered
@@ -139,7 +139,7 @@ describe Gitx::Cli::StartCommand do
       end
       before do
         expect(cli).to receive(:checkout_branch).with('main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '--no-rebase').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', "[gitx] Start work on new-branch\n\nConnected to FOO-123").ordered

data/spec/gitx/cli/update_command_spec.rb

@@ -28,10 +28,10 @@ describe Gitx::Cli::UpdateCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch', '--no-rebase').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update
@@ -45,9 +45,9 @@ describe Gitx::Cli::UpdateCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').and_raise(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch', '--no-rebase').and_raise(Gitx::Executor::ExecutionError).ordered
 
         expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
       end
@@ -60,10 +60,10 @@ describe Gitx::Cli::UpdateCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').and_raise(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch', '--no-rebase').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main', '--no-rebase').and_raise(Gitx::Executor::ExecutionError).ordered
 
         expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
       end
@@ -76,11 +76,11 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).not_to receive(:execute).with('git', 'pull', 'origin', 'feature-branch')
+        expect(executor).not_to receive(:execute).with('git', 'pull', 'origin', 'feature-branch', '--no-rebase')
         expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main', '--no-rebase').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations