squared 0.8.3 → 0.8.5

data/lib/squared/workspace/project/git.rb

@@ -158,10 +158,10 @@ module Squared
                      no-replace-objects noglob-pathspecs paginate attr-source=b config-env=q exec-path=p
                      namespace=p].freeze,
           add: %w[A e|edit f|force ignore-errors ignore-missing i|interactive n|dry-run p|patch pathspec-file-nul
-                  refresh renormalize sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
-                     column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
-                     sort=q t|track=b].freeze,
+                  refresh renormalize resolved sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
+          branch: %w[a|all create-reflog dry-run i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
+                     column=b contains=b delete-merged=q forked=q format=q merged=b no-contains=b no-merged=b
+                     points-at=b u|set-upstream-to=b sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
                        pathspec-file-nul q|quiet ours theirs conflict=b orphan=b pathspec-from-file=p t|track=b].freeze,
           clone: %w[also-filter-submodules bare dissociate l|local mirror no-hardlinks n|no-checkout no-tags o|origin=b
@@ -214,8 +214,9 @@ module Squared
                      i|regexp-ignore-case remove-empty reverse right-only simplify-by-decoration simplify-merges
                      single-worktree show-pulls source sparse stdin topo-order g|walk-reflogs after=q ancestry-path=b?
                      author=q before=q branches=q? committer=q decorate=b decorate-refs=q decorate-refs-exclude=q
-                     exclude=q exclude-hidden=b glob=q grep=q grep-reflog=q n|max-count=i max-parents=i min-parents=i
-                     no-walk=b? remotes=q? since=q since-as-filter=q skip=i tags=q? until=q].freeze,
+                     exclude=q exclude-hidden=b glob=q grep=q grep-reflog=q n|max-count=i max-count-oldest=i
+                     max-parents=i min-parents=i no-walk=b? remotes=q? since=q since-as-filter=q skip=i tags=q?
+                     until=q].freeze,
             format: %w[t children combined-all-paths dd oneline left-right no-diff-merges parents relative-date
                        show-notes-by-default show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q
                        notes=b pretty=q? show-linear-break=q?].freeze,
@@ -225,7 +226,7 @@ module Squared
                      graph ita-invisible-in-index minimal name-only name-status no-color-moved-ws no-prefix no-renames
                      numstat patch-with-raw patch-with-stat patience pickaxe-all pickaxe-regex raw shortstat summary
                      a|text abbrev=i? anchored=q break-rewrites=b? color=b color-moved=b color-moved-ws=b color-words=q?
-                     diff-algorithm=b diff-filter=e? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
+                     diff-algorithm=b diff-filter=q? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
                      find-object=b find-renames=b? ignore-matching-lines=q ignore-submodules=b? line-prefix=q
                      max-depth=n output=p output-indicator-context=q output-indicator-new=q output-indicator-old=q
                      relative=p rotate-to=p skip-to=p src-prefix=q stat=b? stat-count=i stat-width=i stat-name-width=i
@@ -280,7 +281,7 @@ module Squared
             push: %w[a|all u|include-untracked k|keep-index no-keep-index no-include-untracked pathspec-file-nul p|patch
                      S|staged m|message=q pathspec-from-file=p].freeze,
             pop: %w[index].freeze,
-            apply: %w[index].freeze
+            apply: %w[index label-base=b label-ours=b label-theirs=b].freeze
           }.freeze,
           status: %w[z u=bm? b|branch long s|short show-stash v|verbose=+ column=b find-renames=i? ignore-submodules=b?
                      ignored=b? porcelain=b? untracked-files=b?].freeze,
@@ -413,7 +414,8 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote?,opts*'
                       task flag, [:remote] do |_, args|
-                        args = if (remote = args.remote) && !git_grep('remote', remote).empty?
+                        remote = args.remote
+                        args = if remote && !git_grep('remote', remote).empty?
                                  args.extras
                                else
                                  remote = choice_remote
@@ -449,19 +451,21 @@ module Squared
                       task flag, [:commit] do |_, args|
                         ref = args.commit
                         if !ref || ref == ':'
-                          ref = choice_commit('@{u}..', empty: log_message('No pending commits', hint: remotetrack))
+                          ref = choice_commit(range: '@{u}..',
+                                              empty: log_message('No pending commits', hint: remotetrack))
                         end
                         push(flag, args.extras, ref: ref)
                       end
                     else
                       format_desc(action, flag, 'origin?,opts*', after: ('refs*' unless flag == :all))
-                      task flag do |_, args|
-                        args = args.to_a
-                        if (origin = args.first) && !git_grep('remote', origin).empty?
-                          args.shift
-                        else
-                          origin = nil
-                        end
+                      task flag, [:origin] do |_, args|
+                        origin = args.origin
+                        args = if origin && !git_grep('remote', origin).empty?
+                                 args.extras
+                               else
+                                 origin = nil
+                                 args.to_a
+                               end
                         push(flag, args, origin: origin)
                       end
                     end
@@ -555,7 +559,8 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        if (name = args.name)
+                        name = args.name
+                        if name
                           message = args.message
                           commit = commithead args.commit
                           remote = args.remote
@@ -594,9 +599,10 @@ module Squared
                         format_desc action, flag, '(^)commit*|:,opts*,pathspec*'
                         task flag do |_, args|
                           args = args.to_a
-                          if args.empty? || args.first == ':'
-                            args.shift
-                            index = choice_commit(multiple: true)
+                          if choice!(args, empty: true)
+                            index = choice_commit('Choose revision range', multiple: true, series: true)
+                            exclude = choice_commit('With exclusions', multiple: true, force: false)
+                            index.concat(exclude.map { |val| "^#{val}" }) if exclude
                           else
                             index = args.each_with_object([]) do |val, out|
                               if matchhead(val)
@@ -613,33 +619,32 @@ module Squared
                           end
                           log_(flag, args, index: index)
                         end
-                        next
-                      end
-                      format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
-                      task flag, [:commit1, :commit2] do |_, args|
-                        commit1 = commithead args.commit1
-                        if commit1
-                          range = [commit1, commithead(param_guard(action, flag, args: args, key: :commit2))]
-                          opts = args.extras
-                        else
-                          range, opts, refs = choice_commit(multiple: flag == :view ? true : 2,
-                                                            values: %w[Options Pathspec])
-                          range.reverse!
-                          opts = OptionPartition.strip(opts)
-                          opts.concat(refs.shellsplit) if refs
-                        end
-                        if action == 'log'
-                          log_(flag, opts, range: range)
-                        else
-                          diff(flag, opts, range: range, from: action.to_sym)
+                      else
+                        format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
+                        task flag, [:commit1, :commit2] do |_, args|
+                          commit1 = commithead args.commit1
+                          if commit1
+                            range = [commit1, commithead(param_guard(action, flag, args: args, key: :commit2))]
+                            opts = args.extras
+                          else
+                            range, opts, refs = choice_commit(multiple: flag == :view ? true : 2,
+                                                              values: %w[Options Pathspec])
+                            range.reverse!
+                            opts = OptionPartition.strip(opts)
+                            opts.concat(refs.shellsplit) if refs
+                          end
+                          if action == 'log'
+                            log_(flag, opts, range: range)
+                          else
+                            diff(flag, opts, range: range, from: action.to_sym)
+                          end
                         end
                       end
                     when :head
                       format_desc action, flag, 'commit*|:,opts*,pathspec*'
                       task flag do |_, args|
                         args = args.to_a
-                        if args.empty? || args.first == ':'
-                          args.shift
+                        if choice!(args, empty: true)
                           index = choice_commit(multiple: true)
                         else
                           index = args.each_with_object([]) do |val, out|
@@ -681,10 +686,10 @@ module Squared
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(f(-ormat)?)=(.+)$/
+                            if last =~ /^f(?:-ormat)?=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(max(-count)?)=(\d+)$/
+                            elsif last =~ /^max(?:-count)?=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -699,9 +704,10 @@ module Squared
                   when 'checkout'
                     case flag
                     when :branch
-                      format_desc action, flag, 'name,create?=[bB],commit?,d/etach?'
-                      task flag, [:name, :create, :commit, :detach] do |_, args|
-                        if (branch = args.name)
+                      format_desc action, flag, 'branch,create?=[bB],commit?,d/etach?'
+                      task flag, [:branch, :create, :commit, :detach] do |_, args|
+                        branch = args.branch
+                        if branch
                           create = args.create
                           detach = if args.commit == 'd'
                                      commit = nil
@@ -725,9 +731,10 @@ module Squared
                         checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :track
-                      format_desc action, flag, 'origin,(^)name?'
-                      task flag, [:origin, :name] do |_, args|
-                        if (origin = args.origin)
+                      format_desc action, flag, 'remote,(^)name?'
+                      task flag, [:remote, :name] do |_, args|
+                        origin = args.remote
+                        if origin
                           branch = args.name
                         else
                           origin, branch = choice_refs('Choose a remote', 'remotes', values: 'Enter branch name')
@@ -778,7 +785,8 @@ module Squared
                     when :track
                       format_desc action, flag, '(^~)upstream?,name?'
                       task flag, [:upstream, :name] do |_, args|
-                        if (ref = args.upstream)
+                        ref = args.upstream
+                        if ref
                           target = args.name
                           remote = true if ref.delete_prefix!('~')
                         else
@@ -791,12 +799,12 @@ module Squared
                       format_desc action, flag, '[^~]name*,:?'
                       task flag do |_, args|
                         refs = args.to_a
-                        if refs.empty? || (i = refs.last == ':')
+                        if refs.empty? || (ia = refs.last == ':')
                           accept = ['Delete?']
-                          accept << accept_b('Force?') unless i
-                          remote = choice_refs('Choose a branch', i ? 'remotes' : 'heads', multiple: true,
-                                                                                           accept: accept)
-                          if i
+                          accept << accept_b('Force?') unless ia
+                          remote = choice_refs('Choose a branch', ia ? 'remotes' : 'heads', multiple: true,
+                                                                                            accept: accept)
+                          if ia
                             refs.pop
                           else
                             refs = remote.first
@@ -814,7 +822,8 @@ module Squared
                     when :move, :copy
                       format_desc action, flag, 'branch,oldbranch?'
                       task flag, [:branch, :oldbranch] do |_, args|
-                        if (branch = args.branch)
+                        branch = args.branch
+                        if branch
                           oldbranch = args.oldbranch
                         else
                           oldbranch, branch = choice_refs("Choose a branch to #{flag}",
@@ -831,18 +840,19 @@ module Squared
                   when 'clone'
                     format_desc(action, flag, flag == :tag ? 'dir,tag/:' : 'dir,branch/:', after: 'opts*')
                     task flag, [:dir, :ref] do |_, args|
-                      dir = emptypath(param_guard(action, flag, args: args, key: :dir), create: false)
-                      unless (ref = args.ref) && ref != ':'
+                      dir = param_guard(action, flag, args: args, key: :dir)
+                      ref = args.ref
+                      if !ref || ref == ':'
                         ref = flag == :tag ? choice_refs('Choose a tag', 'tags') : choice_refs('Choose a branch')
                       end
-                      clone(flag, args.extras, dir: dir, ref: ref)
+                      clone(flag, args.extras, dir: emptypath(dir, create: false), ref: ref)
                     end
                   when 'switch'
                     case flag
                     when :create
-                      format_desc action, flag, '(^)name,commit?|:'
-                      task flag, [:name, :commit] do |_, args|
-                        branch = param_guard(action, flag, args: args, key: :name)
+                      format_desc action, flag, '(^)branch,commit?|:'
+                      task flag, [:branch, :commit] do |_, args|
+                        branch = param_guard(action, flag, args: args, key: :branch)
                         commit = commithead args.commit
                         commit, track = choice_commit(force: false, values: 'Track? [Y/n]') if commit == ':'
                         switch(flag, branch: branch, commit: commit, track: track)
@@ -855,15 +865,11 @@ module Squared
                         switch(flag, commit: commit)
                       end
                     when :branch
-                      format_desc action, flag, 'name/:,opts*'
-                      task flag, [:name] do |_, args|
-                        args = if (branch = args.name)
-                                 branch = nil if branch == ':'
-                                 args.extras
-                               else
-                                 []
-                               end
-                        switch(flag, args, branch: branch || choice_refs('Choose a branch'))
+                      format_desc action, flag, 'branch/:,opts*'
+                      task flag, [:branch] do |_, args|
+                        branch = args.branch
+                        branch = nil if branch == ':'
+                        switch(flag, args.extras, branch: branch || choice_refs('Choose a branch'))
                       end
                     end
                   when 'reset'
@@ -872,17 +878,16 @@ module Squared
                       format_desc action, flag, 'commit?|:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
-                        args = if commit && commit != ':'
-                                 args.extras
-                               else
-                                 commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                                 args.extras.concat(case mode&.downcase
-                                                    when 'h', 'hard' then ['hard']
-                                                    when 's', 'soft' then ['soft']
-                                                    when 'n', 'N' then %w[mixed N]
-                                                    else ['mixed']
-                                                    end)
-                               end
+                        args = args.extras
+                        if !commit || commit == ':'
+                          commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
+                          args.concat(case mode&.downcase
+                                      when 'h', 'hard' then ['hard']
+                                      when 's', 'soft' then ['soft']
+                                      when 'n', 'N' then %w[mixed N]
+                                      else ['mixed']
+                                      end)
+                        end
                         success?(reset(flag, args, commit: commit))
                       end
                     when :index
@@ -931,9 +936,11 @@ module Squared
                   when 'rebase', 'merge'
                     case flag
                     when :branch
-                      format_desc action, flag, 'upstream?,opts*'
+                      format_desc action, flag, 'upstream?|:,opts*'
                       task flag, [:upstream] do |_, args|
-                        args = if (upstream = args.upstream)
+                        upstream = args.upstream
+                        args = if upstream
+                                 upstream = choice_refs 'Choose upstream branch' if upstream == ':'
                                  args.extras
                                else
                                  upstream, opts = choice_refs('Choose upstream branch', values: 'Options')
@@ -961,8 +968,9 @@ module Squared
                     when :commit, :'no-commit'
                       format_desc action, flag, 'branch|:,ours|theirs?,opts*'
                       task flag, [:branch] do |_, args|
-                        current = `#{git_output('branch --show-current')}`.chomp
-                        if (branch = args.branch)
+                        branch = args.branch
+                        current = git_spawn('branch --show-current').chomp
+                        if branch
                           branch = choice_refs('Choose a branch', accept: "#{action.capitalize}?") if branch == ':'
                           opts = args.extras
                           if has_value!(opts, 'ours')
@@ -975,9 +983,11 @@ module Squared
                                                                         accept: "Merge with #{current}?")
                           opts = OptionPartition.strip(opts)
                         end
-                        raise ArgumentError, 'nothing to merge' if current == branch
-
-                        merge(flag, opts, branch: branch)
+                        if current == branch
+                          puts log_message('nothing to merge', subject: name, hint: branch)
+                        else
+                          merge(flag, opts, branch: branch)
+                        end
                       end
                     when :send
                       format_desc(action, flag, VAL_GIT[action.to_sym][:send], arg: nil)
@@ -994,7 +1004,7 @@ module Squared
                       task flag, [:ref, :size] do |_, args|
                         ref = commithead args.ref
                         size = args.size
-                        if !size && ref.to_i.between?(1, 40)
+                        if !size && ref.to_i.between?(4, 40)
                           size = ref
                           ref = nil
                         end
@@ -1023,7 +1033,8 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote?|:,opts*,pattern*'
                       task flag, [:remote] do |_, args|
-                        args = if (remote = args.remote) && (remote == ':' || !git_grep('remote', remote).empty?)
+                        remote = args.remote
+                        args = if remote && (remote == ':' || !git_grep('remote', remote).empty?)
                                  remote = choice_remote(force: true) if remote == ':'
                                  args.extras
                                else
@@ -1501,7 +1512,7 @@ module Squared
           else
             args = parse_env('GIT_OPTIONS')
                    .grep(/\A--#{Regexp.union(*VAL_GIT[:revbuild])}/)
-                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option(key, val) } })
+                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option key, val } })
                    .compact
             OptionPartition.uniq!(args)
           end
@@ -1522,7 +1533,7 @@ module Squared
           start = time_epoch
           ret = build(*@output, sync: sync, from: from)
         rescue => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, pass: true)
         else
           if ret == false && !kwargs[:pass]
             print_status('revbuild', subject: name, start: start, loglevel: Logger::WARN, from: :failed)
@@ -1568,7 +1579,7 @@ module Squared
               unless force
                 i = -1
                 op.each do |val|
-                  if !val.include?(':') && repofetch(origin, branch: val, sync: (i += 1).zero?).first.nil?
+                  if !val.include?(':') && repofetch(origin, branch: val, sync: (i += 1) == 0).first.nil?
                     op.errors << val
                   else
                     op.found << val
@@ -1624,7 +1635,7 @@ module Squared
           append_option 'f', 'force', 'merge'
           case flag
           when :branch
-            cmd << '--detach' if detach == 'd' || option('detach')
+            cmd << '--detach' if detach == 'd' || option('d', 'detach')
             append_option('track', equals: true)
             cmd << (create ? quote_option(create, branch) : branch) << commit
           when :track
@@ -1652,7 +1663,7 @@ module Squared
           cmd, opts = git_session('tag', opts: opts)
           case flag
           when :add, :sign
-            if flag == :sign || option('sign')
+            if flag == :sign
               cmd << '--sign'
             elsif !session_arg?('s', 'sign', 'u', 'local-user')
               cmd << '--annotate'
@@ -1812,8 +1823,10 @@ module Squared
             return if pass
 
             upstream = true
-            unless (origin = option('origin', 'upstream', prefix: 'git', ignore: false))
-              if (origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false))
+            origin = option('origin', 'upstream', prefix: 'git', ignore: false)
+            unless origin
+              origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false)
+              if origin
                 git_spawn 'branch', quote_option('set-upstream-to', origin)
                 upstream = false
               else
@@ -1963,7 +1976,7 @@ module Squared
               out, banner, from = source(io: true)
               first = from_base?('branch')
               grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
-              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
+              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, i|
                 next line if stdin?
 
                 data = line.sub(/^\*?\s+/, '').split(/\s+/, 3)
@@ -1977,13 +1990,13 @@ module Squared
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                ["#{"\n" unless index == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{md[2]}"]
+                ["#{"\n" unless i == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{md[2]}"]
                   .compact
                   .join("\n")
               end
               on :last, from
             end
-            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
+            print_error('no ref found', subject: name, hint: 'branch: head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout), !ref && flag == :create) && !ref && remote && target
@@ -2047,7 +2060,7 @@ module Squared
             cmd << '--textconv'
             append_value(files.flat_map { |val| Dir[val] }
                               .select { |val| projectpath?(val) }
-                              .map { |val| shell_quote("HEAD:#{val}") })
+                              .map { |val| "HEAD:#{val}" })
             source(banner: false)
             return
           when :oneline
@@ -2061,11 +2074,11 @@ module Squared
           else
             opts << format if format
           end
-          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
+          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + collect_hash(OPT_GIT[:log], pass: [:base])
           op = OptionPartition.new(opts, list, cmd,
                                    project: self, strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
-          op.append(delim: true)
+          op.append
           source(exception: false, banner: flag != :oneline)
         end
 
@@ -2073,7 +2086,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
+            cmd << (size.to_i == 0 ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref' << '--symbolic-full-name' << shell_quote(case ref
@@ -2141,8 +2154,7 @@ module Squared
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?,
-                                                    no: OPT_GIT[:no][flag], single: /\A\d+\z/,
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: OPT_GIT[:no][flag],
                                                     first: case flag
                                                            when :blame, :revert, :'sparse-checkout' then nil
                                                            else matchpathspec
@@ -2291,7 +2303,7 @@ module Squared
               run_e(cmd, stderr: stderr, banner: banner, **kwargs)
             end
           rescue Timeout::Error => e
-            print_error(Logger::ERROR, cmd, subject: name, hint: e)
+            print_error(Logger::ERROR, e, subject: name, hint: cmd)
             exit 1 unless exception?(Logger::DEBUG, Logger::INFO)
           rescue => e
             on_error(e, pass: true)
@@ -2329,12 +2341,12 @@ module Squared
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
-        def choice_commit(range = nil, count: true, reflog: true, force: true, **kwargs)
+        def choice_commit(msg = 'Choose a commit', range: nil, count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log', range)
           cmd << quote_option('format', "#{commitstyle('%h')} %s")
           cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
-          ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
+          ret = choice_index(msg, git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
             ret.map { |val| val&.stripstyle }
@@ -2480,7 +2492,7 @@ module Squared
         def foreachref(path, *args, format: nil, chomp: true)
           format &&= quote_option('format', format)
           ret = git_spawn('for-each-ref', format, *args.concat(Array(path).map { |val| "refs/#{val}" }),
-                          stdout: workspace.windows?)
+                          stdout: windows?)
           if ret.is_a?(String)
             ret.lines(chomp: chomp)
           elsif chomp
@@ -2565,7 +2577,7 @@ module Squared
         end
 
         def remotetrack
-          git_spawn('rev-parse --abbrev-ref @{u}').split('/', 2).first
+          git_spawn('rev-parse --abbrev-ref @{u}').split('/').first
         end
 
         def commithash(val)