squared 0.8.1 → 0.8.3

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

@@ -143,7 +143,6 @@ module Squared
         end
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue => e
-        log&.debug e
         warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
@@ -165,6 +164,16 @@ module Squared
                      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
+                    progress q|quiet s|shared sparse v|verbose b|branch=b bundle-uri=q c|config=q depth=i filter=q
+                    j|jobs=i reference=q reference-if-able=q o|origin=b recurse-submodules=p? ref-format=b
+                    separate-git-dir=p server-option=q shallow-exclude=b shallow-since=v template=p
+                    u|upload-pack=q].freeze,
+          commit: %w[e n s S=bm? u=bm? a|all allow-empty allow-empty-message amend branch dry-run i|include long
+                     no-post-rewrite o|only pathspec-file-nul z|null p|patch porcelain q|quiet reset-author short
+                     v|verbose trailer=q author=q cleanup=b date=q fixup=b f|file=p gpg-sign=b c|reedit-message=b
+                     C|reuse-message=b m|message=q pathspec-from-file=p squash=b t|template=p
+                     untracked-files=b?].freeze,
           diff: {
             base: %w[0 1|base 2|ours 3|theirs cached merge-base].freeze,
             show: %w[s exit-code histogram].freeze
@@ -172,9 +181,10 @@ module Squared
           fetch: {
             base: %w[multiple porcelain progress P|prune-tags refetch stdin u|update-head-ok
                      recurse-submodules-default=b?].freeze,
-            pull: %w[4 6 n t a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet set-upstream
-                     unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q recurse-submodules=v
-                     refmap=q o|server-option=q shallow-exclude=b shallow-since=v upload-pack=q].freeze
+            pull: %w[n t 4|ipv4 6|ipv6 a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet
+                     set-upstream unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q
+                     recurse-submodules=v refmap=q o|server-option=q shallow-exclude=b shallow-since=v
+                     upload-pack=q].freeze
           }.freeze,
           git: {
             add: %w[N|intent-to-add].freeze,
@@ -230,6 +240,9 @@ module Squared
                     gpg-sign=b? into-name=b log=i s|strategy=b X|strategy-option=b].freeze,
           pull: %w[e n S=bm? allow-unrelated-histories compact-summary ff-only cleanup=b gpg-sign=b? log=i r|rebase=v?
                    s|strategy=b X|strategy-option=b].freeze,
+          push: %w[4|ipv4 6|ipv6 d|delete f|force n|dry-run follow-tags mirror no-recurse-submodules porcelain progress
+                   prune q|quiet u|set-upstream tags v|verbose exec=q force-with-lease=b o|push-option=q receive-pack=q
+                   recurse-submodules=b repo=q signed=b].freeze,
           range_diff: %w[left-only no-dual-color no-notes remerge-diff right-only creation-factor=i diff-merges=b
                          notes=q?].freeze,
           rebase: %w[n C=im S=bm? allow-empty-message apply committer-date-is-author-date edit-todo empty=b
@@ -288,9 +301,11 @@ module Squared
             blame: %w[progress].freeze,
             branch: %w[color color-moved column track].freeze,
             checkout: %w[overwrite-ignore guess overlay progress recurse-submodules track].freeze,
+            clone: %w[reject-shallow remote-submodules single-branch shallow-submodules].freeze,
+            commit: %w[edit gpg-sign signoff status verify].freeze,
             fetch: {
               base: %w[auto-gc auto-maintenance write-commit-graph write-fetch-head].freeze,
-              pull: %w[all ipv4 ipv6 recurse-submodules show-forced-updates tags].freeze
+              pull: %w[all recurse-submodules show-forced-updates tags].freeze
             },
             grep: %w[color exclude-standard recursive textconv].freeze,
             log: {
@@ -301,6 +316,7 @@ module Squared
             merge: %w[autostash edit ff gpg-sign log overwrite-ignore progress rerere-autoupdate signoff squash stat
                       verify verify-signatures].freeze,
             pull: %w[autostash commit edit gpg-sign ff log rebase signoff squash stat verify verify-signatures].freeze,
+            push: %w[atomic force-if-includes force-with-lease signed thin verify].freeze,
             rebase: %w[autosquash autostash fork-point gpg-sign keep-empty reapply-cherry-picks rebase-merges
                        rerere-autoupdate reschedule-failed-exec stat update-refs verify].freeze,
             reset: %w[refresh].freeze,
@@ -323,7 +339,7 @@ module Squared
           }.freeze,
           rebase: {
             send: %w[continue skip abort quit].freeze,
-            value: %w[true false merges interactive].freeze
+            value: %w[false true merges interactive].freeze
           }.freeze,
           reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
           revbuild: %w[untracked-files ignore-submodules ignored].freeze
@@ -347,7 +363,8 @@ module Squared
         subtasks({
           'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
-          'commit' => %i[add all amend amend-orig fixup].freeze,
+          'commit' => %i[head add all amend amend-orig fixup].freeze,
+          'clone' => %i[branch tag].freeze,
           'diff' => %i[head branch files view between contain].freeze,
           'range-diff' => %i[view between contain].freeze,
           'fetch' => %i[origin remote all].freeze,
@@ -356,6 +373,7 @@ module Squared
           'log' => %i[grep view between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote all].freeze,
+          'push' => %i[origin remote commit all tags].freeze,
           'rebase' => %i[branch onto send].freeze,
           'refs' => %i[heads tags remote].freeze,
           'remote' => %i[add select].freeze,
@@ -395,7 +413,7 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote?,opts*'
                       task flag, [:remote] do |_, args|
-                        args = if (remote = args.remote)
+                        args = if (remote = args.remote) && !git_grep('remote', remote).empty?
                                  args.extras
                                else
                                  remote = choice_remote
@@ -409,6 +427,44 @@ module Squared
                         __send__ action, flag, args.to_a
                       end
                     end
+                  when 'push'
+                    case flag
+                    when :origin, :remote
+                      format_desc(action, flag, 'branch/::,opts*', before: ('origin/:' if flag == :remote))
+                      task flag, (flag == :remote ? %i[origin branch] : %i[branch]) do |_, args|
+                        if flag == :remote
+                          origin = param_guard(action, flag, args: args, key: :origin)
+                          origin = choice_remote(force: true) if origin == ':' || !git_grep('remote', origin).empty?
+                        else
+                          origin = remotetrack
+                        end
+                        branch = param_guard(action, flag, args: args, key: :branch)
+                        if branch == '::'
+                          branch = choice_refs('Choose a branch', 'heads', series: true, accept: 'Push?')
+                        end
+                        push(flag, args.extras, origin: origin, branch: branch)
+                      end
+                    when :commit
+                      format_desc action, flag, 'commit?|:,opts*'
+                      task flag, [:commit] do |_, args|
+                        ref = args.commit
+                        if !ref || ref == ':'
+                          ref = choice_commit('@{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
+                        push(flag, args, origin: origin)
+                      end
+                    end
                   when 'submodule'
                     break unless @submodule
 
@@ -435,10 +491,14 @@ module Squared
                     end
                   when 'commit'
                     case flag
-                    when :all
-                      format_desc action, flag, 'message?'
+                    when :head, :all
+                      format_desc(action, flag, 'message?|:', after: ('opts*,pathspec*' if flag == :head))
                       task flag, [:message] do |_, args|
-                        commit(flag, message: args.message)
+                        message = args.message
+                        if message == ':' || (!message && flag == :head)
+                          message = readline('Enter message', force: true)
+                        end
+                        commit(flag, flag == :head ? args.extras : [], message: message)
                       end
                     else
                       format_desc(action, flag, 'pathspec+', before: ('opts*' if flag == :add))
@@ -534,7 +594,7 @@ module Squared
                         format_desc action, flag, '(^)commit*|:,opts*,pathspec*'
                         task flag do |_, args|
                           args = args.to_a
-                          if args.first == ':'
+                          if args.empty? || args.first == ':'
                             args.shift
                             index = choice_commit(multiple: true)
                           else
@@ -578,7 +638,7 @@ module Squared
                       format_desc action, flag, 'commit*|:,opts*,pathspec*'
                       task flag do |_, args|
                         args = args.to_a
-                        if args.first == ':'
+                        if args.empty? || args.first == ':'
                           args.shift
                           index = choice_commit(multiple: true)
                         else
@@ -672,13 +732,14 @@ module Squared
                         else
                           origin, branch = choice_refs('Choose a remote', 'remotes', values: 'Enter branch name')
                         end
-                        checkout(flag, branch: branch, origin: origin)
+                        checkout(flag, origin: origin, branch: branch)
                       end
                     when :commit
-                      format_desc action, flag, 'ref,opts*'
+                      format_desc action, flag, 'commit?|:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit
+                                 commit = choice_commit if commit == ':'
                                  args.extras
                                else
                                  commit, opts = choice_commit(values: 'Options')
@@ -687,7 +748,7 @@ module Squared
                         checkout(flag, args, commit: commit)
                       end
                     when :detach
-                      format_desc action, flag, 'ref?'
+                      format_desc action, flag, 'commit?'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         unless commit
@@ -705,7 +766,7 @@ module Squared
                   when 'branch'
                     case flag
                     when :create
-                      format_desc action, flag, 'name,ref/:'
+                      format_desc action, flag, 'name,ref?|:'
                       task flag, [:name, :ref] do |_, args|
                         target = param_guard(action, flag, args: args, key: :name)
                         ref = commithead args.ref
@@ -767,10 +828,19 @@ module Squared
                         branch flag
                       end
                     end
+                  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 != ':'
+                        ref = flag == :tag ? choice_refs('Choose a tag', 'tags') : choice_refs('Choose a branch')
+                      end
+                      clone(flag, args.extras, dir: dir, ref: ref)
+                    end
                   when 'switch'
                     case flag
                     when :create
-                      format_desc action, flag, '(^)name,ref/:'
+                      format_desc action, flag, '(^)name,commit?|:'
                       task flag, [:name, :commit] do |_, args|
                         branch = param_guard(action, flag, args: args, key: :name)
                         commit = commithead args.commit
@@ -778,9 +848,10 @@ module Squared
                         switch(flag, branch: branch, commit: commit, track: track)
                       end
                     when :detach
-                      format_desc action, flag, 'ref?'
+                      format_desc action, flag, 'commit?|:'
                       task flag, [:commit] do |_, args|
-                        commit = commithead(args.commit) || choice_commit(force: false)
+                        commit = commithead args.commit
+                        commit = choice_commit(force: false) if commit == ':'
                         switch(flag, commit: commit)
                       end
                     when :branch
@@ -798,7 +869,7 @@ module Squared
                   when 'reset'
                     case flag
                     when :commit
-                      format_desc action, flag, 'ref/:,opts*'
+                      format_desc action, flag, 'commit?|:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit && commit != ':'
@@ -860,7 +931,7 @@ module Squared
                   when 'rebase', 'merge'
                     case flag
                     when :branch
-                      format_desc action, flag, 'upstream,branch?,opts*'
+                      format_desc action, flag, 'upstream?,opts*'
                       task flag, [:upstream] do |_, args|
                         args = if (upstream = args.upstream)
                                  args.extras
@@ -871,11 +942,12 @@ module Squared
                         rebase(flag, args, upstream: upstream)
                       end
                     when :onto
-                      format_desc action, flag, 'ref,upstream,branch?'
+                      format_desc action, flag, 'commit|:,upstream,branch?'
                       task flag, [:commit, :upstream, :branch] do |_, args|
                         commit = commithead args.commit
                         args = if commit
                                  upstream = param_guard(action, flag, args: args, key: :upstream)
+                                 commit = choice_commit if commit == ':'
                                  branch = args.branch
                                  []
                                else
@@ -949,9 +1021,16 @@ module Squared
                     end
                   when 'refs', 'files'
                     if flag == :remote
-                      format_desc action, flag, 'remote?,opts*,pattern*'
+                      format_desc action, flag, 'remote?|:,opts*,pattern*'
                       task flag, [:remote] do |_, args|
-                        ls_remote(flag, args.extras, remote: args.remote)
+                        args = if (remote = args.remote) && (remote == ':' || !git_grep('remote', remote).empty?)
+                                 remote = choice_remote(force: true) if remote == ':'
+                                 args.extras
+                               else
+                                 remote = remotetrack
+                                 args.to_a
+                               end
+                        ls_remote(flag, args, remote: remote)
                       end
                     else
                       format_desc(action, flag, 'opts*,pattern*', after: ('pathspec*' if action == 'files'))
@@ -962,10 +1041,11 @@ module Squared
                   when 'restore'
                     case flag
                     when :source
-                      format_desc action, flag, 'ref,opts*,pathspec*'
+                      format_desc action, flag, 'commit?|:,opts*,pathspec*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit
+                                 commit = choice_commit if commit == ':'
                                  args.extras
                                else
                                  commit, opts, files = choice_commit(values: ['Options', ['Pathspec', true]])
@@ -1118,13 +1198,13 @@ module Squared
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, strict: strict?,
                                                                   no: OPT_GIT[:no][:pull])
               opts -= op.extras
-              reg = matchmap op
+              reg, neg = matchmap(op, negate: true)
               session_done op.target
               heads = []
               cur = nil
               foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
                 cur ||= line.delete_prefix!('* ')
-                heads << line if matchany?(reg, line)
+                heads << line if matchany?(reg, line) && !matchany?(neg, line, empty: false)
               end
               raise message('head not found', hint: 'for-each-ref') unless cur
 
@@ -1204,45 +1284,62 @@ module Squared
           end
         end
 
-        def clone(*, sync: invoked_sync?('clone'), **)
-          return unless clone? && (data = workspace.git_repo(name))
+        def clone(flag = nil, opts = [], sync: invoked_sync?('clone'), dir: nil, ref: nil, **)
+          if flag
+            return unless dir && ref
+
+            url = git_spawn("config --get remote.#{remotetrack}.url")
+            cmd, opts = git_session('clone', worktree: false, opts: opts)
+            op = OptionPartition.new(opts, OPT_GIT[:clone], cmd, project: self, strict: strict?,
+                                                                 no: OPT_GIT[:no][:clone])
+            op.add_option('b', ref)
+              .delim
+              .add_quote(url.chomp)
+              .add_path(dir)
+              .clear
+            source
+          else
+            return unless clone? && (data = workspace.git_repo(name))
 
-          cmd = git_session('clone', worktree: false)
-          opts = data[1].dup
-          option('depth', ignore: false) do |val|
-            if (n = val.to_i) > 0
-              opts[:depth] = n
+            cmd = git_session('clone', worktree: false)
+            opts = data[1].dup
+            option('depth', ignore: false) do |val|
+              if (n = val.to_i) > 0
+                opts[:depth] = n
+              else
+                opts.delete(:depth)
+              end
+            end
+            option('origin', ignore: false) { |val| opts[:origin] = val }
+            if (branch = option('branch', strict: true))
+              opts[:branch] = branch
+              opts.delete(:revision)
             else
-              opts.delete(:depth)
+              option('revision', strict: true) do |val|
+                opts[:revision] = val
+                opts.delete(:branch)
+                opts.delete(:mirror)
+              end
             end
-          end
-          option('origin', ignore: false) { |val| opts[:origin] = val }
-          if (branch = option('branch', strict: true))
-            opts[:branch] = branch
-            opts.delete(:revision)
-          else
-            option('revision', strict: true) do |val|
-              opts[:revision] = val
-              opts.delete(:branch)
-              opts.delete(:mirror)
+            option('local', strict: true) { |val| opts[:local] = val != '0' }
+            option('bare') { |val| opts[:bare] = val }
+            option('single-branch', ignore: false) do |val|
+              opts[:'single-branch'] = val != '0' && val != 'false'
+              opts.delete(:'no-single-branch')
             end
+            option('no-checkout') do
+              opts[:'no-checkout'] = true
+              opts.delete(:n)
+            end
+            option('no-tags') { opts[:'no-tags'] = true }
+            if append_submodules(from: :clone)
+              opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules')
+            end
+            append_hash opts
+            cmd << '--quiet' if quiet? || option('quiet')
+            append_value(data[0], path, delim: true)
+            source(sync: sync, banner: sync && !quiet?, multiple: !sync || quiet?)
           end
-          option('local', strict: true) { |val| opts[:local] = val != '0' }
-          option('bare') { |val| opts[:bare] = val }
-          option('single-branch', ignore: false) do |val|
-            opts[:'single-branch'] = val != '0' && val != 'false'
-            opts.delete(:'no-single-branch')
-          end
-          option('no-checkout') do
-            opts[:'no-checkout'] = true
-            opts.delete(:n)
-          end
-          option('no-tags') { opts[:'no-tags'] = true }
-          opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
-          append_hash opts
-          cmd << '--quiet' if quiet? || option('quiet')
-          append_value(data[0], path, delim: true)
-          source(sync: sync, banner: sync && !quiet?, multiple: !sync || quiet?)
         end
 
         def stash(flag = nil, opts = [], sync: invoked_sync?('stash', flag))
@@ -1272,7 +1369,11 @@ module Squared
                                                       first: (matchpathspec if flag == :push))
             case flag
             when :push
-              op.readline('Enter message', option: 'message', quote: true) if op.remove(':')
+              if op.remove(':')
+                op.readline('Enter message', option: 'message', quote: true)
+              else
+                append_message
+              end
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1304,7 +1405,7 @@ module Squared
               op.clear
               out, banner, from = source(io: true)
               print_item banner
-              list_result(write_lines(out), 'objects', from: from)
+              list_result(write_lines(out), 'objects', banner: banner, from: from)
               return
             end
           else
@@ -1356,7 +1457,7 @@ module Squared
           end
           out, banner, from = source(io: true)
           ret = write_lines(out, banner: banner, sub: sub)
-          list_result(ret, 'files', action: 'modified', from: from)
+          list_result(ret, 'files', action: 'modified', banner: banner, from: from)
         end
 
         def revbuild(flag = nil, opts = [], **kwargs)
@@ -1434,6 +1535,55 @@ module Squared
           end
         end
 
+        def push(flag = nil, opts = [], origin: nil, branch: nil, ref: nil)
+          cmd, opts = git_session('push', opts: opts)
+          op = OptionPartition.new(opts, OPT_GIT[:push], cmd, project: self, strict: strict?, no: OPT_GIT[:no][:push])
+          force = op.arg?('f', 'force', 'force-with-lease')
+          case flag
+          when :origin, :remote
+            exit 1 unless origin && branch
+            unless force
+              repofetch(origin, branch: branch)
+              exit 1 if (branch.start_with?(':') || op.arg?('d', 'delete')) && !confirm_basic('Delete?', branch, 'N')
+            end
+            op.append(origin, branch)
+              .clear(pass: false)
+          when :commit
+            exit 1 unless ref
+            branch ||= git_spawn('name-rev --name-only', ref).chomp
+            raise ArgumentError, message('could not resolve upstream branch', hint: ref) if branch.empty?
+
+            op.append(remotetrack, "#{ref}:#{branch}")
+              .clear(pass: false)
+          when :all
+            op << '--all'
+            op.add_quote(origin) if origin ||= option('origin')
+            op.clear
+          else
+            op << "--#{flag}" if flag
+            op.concat(Array(branch)) if branch
+            origin ||= option('origin')
+            if !op.empty?
+              origin ||= remotetrack
+              unless force
+                i = -1
+                op.each do |val|
+                  if !val.include?(':') && repofetch(origin, branch: val, sync: (i += 1).zero?).first.nil?
+                    op.errors << val
+                  else
+                    op.found << val
+                  end
+                end
+              end
+              op.add_quote(origin, *op.found)
+                .clear(errors: !force, pass: false)
+            elsif origin
+              op.add_quote(origin)
+            end
+          end
+          source
+        end
+
         def reset(flag, opts = [], refs: nil, ref: nil, mode: nil, commit: nil)
           cmd, opts = git_session('reset', opts: opts)
           case flag
@@ -1469,7 +1619,7 @@ module Squared
           source
         end
 
-        def checkout(flag, opts = [], branch: nil, origin: nil, create: nil, commit: nil, detach: nil, merge: false)
+        def checkout(flag, opts = [], origin: nil, branch: nil, create: nil, commit: nil, detach: nil, merge: false)
           cmd, opts = git_session('checkout', opts: opts)
           append_option 'f', 'force', 'merge'
           case flag
@@ -1525,7 +1675,7 @@ module Squared
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
-            list_result(ret, 'tags', grep: op.extras, from: from)
+            list_result(ret, 'tags', grep: op.extras, banner: banner, from: from)
             return
           end
           if (ret = source) && (remote ||= option('remote'))
@@ -1536,9 +1686,9 @@ module Squared
 
         def log_(flag, opts = [], range: [], index: [], grep: [])
           cmd, opts = git_session('log', opts: opts)
-          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self, strict: strict?,
-                                                                           no: collect_hash(OPT_GIT[:no][:log]),
-                                                                           first: matchpathspec)
+          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
+                                   project: self, strict: strict?, no: collect_hash(OPT_GIT[:no][:log]),
+                                   first: matchpathspec)
           case flag
           when :between, :contain
             op.add_quote(range.join(flag == :between ? '..' : '...'))
@@ -1612,10 +1762,29 @@ module Squared
         end
 
         def commit(flag, opts = [], refs: [], ref: nil, squash: nil, pick: nil, message: nil, pass: false)
-          fixup = flag == :fixup
-          amend = flag.match?(/^amend/) && !fixup
-          unless flag == :add || pick == 'reword'
-            pathspec = if flag == :all || ((fixup || amend) && refs.size == 1 && refs.first == '*')
+          case flag
+          when :head
+            cmd, opts = git_session('commit', opts: opts)
+            op = OptionPartition.new(opts, OPT_GIT[:commit], cmd, project: self, strict: strict?,
+                                                                  no: OPT_GIT[:no][:commit], first: matchpathspec)
+            append_message message
+            if op.arg?('p', 'patch', 'i', 'interactive')
+              op.clear
+            else
+              append_pathspec op.extras
+            end
+            return source
+          when :all
+            pathspec = '--all'
+          when :add
+            pathspec = false
+          when :amend, :'amend-orig'
+            amend = true
+          else
+            pathspec = false if pick == 'reword'
+          end
+          if pathspec.nil?
+            pathspec = if (flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
                          '--all'
                        elsif (refs = projectmap(refs)).empty?
                          raise 'no qualified pathspec'
@@ -1623,8 +1792,8 @@ module Squared
                          "-- #{refs.join(' ')}"
                        end
           end
-          if fixup
-            ret = source(git_session('commit', basic_option('fixup', pick ? "#{pick}:#{ref}" : ref), pathspec))
+          if flag == :fixup
+            ret = source(git_session('commit', basic_option('fixup', pick ? task_join(pick, ref) : ref), pathspec))
             source git_output('rebase --autosquash', squash) if ret && squash.is_a?(String)
             return ret
           end
@@ -1634,34 +1803,23 @@ module Squared
 
             message = readline('Enter message', force: true)
           end
-          branch = nil
-          origin = nil
-          upstream = nil
           cmd, opts = git_session('add', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:add] + OPT_GIT[:log][:diff_context], cmd,
                                    project: self, strict: strict?, no: OPT_GIT[:no][:add], first: matchpathspec)
           op << '--verbose' unless silent?
-          format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
-          git_spawn 'fetch --no-tags --quiet'
-          foreachref('heads', format: format).each do |line|
-            next if line.empty?
-
-            branch, origin, hint = line.split('...')
-            raise message('work tree is not usable', hint: hint[1..-2]) if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
-
-            if (!origin || origin.empty?) && !dryrun?
-              return nil if pass
+          origin, branch = repofetch
+          unless origin || dryrun?
+            return if pass
 
-              unless (origin = option('upstream', prefix: 'git', ignore: false))
-                if (origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false))
-                  git_spawn 'branch', quote_option('set-upstream-to', origin)
-                  break
-                end
+            upstream = true
+            unless (origin = option('origin', 'upstream', prefix: 'git', ignore: false))
+              if (origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false))
+                git_spawn 'branch', quote_option('set-upstream-to', origin)
+                upstream = false
+              else
                 origin = readline('Enter an upstream', force: true)
               end
-              upstream = true
             end
-            break
           end
           if pathspec
             op << pathspec
@@ -1794,7 +1952,7 @@ module Squared
               opt_style(color(:green), /^(\*\s+)(\S+)(.*)$/, 2),
               opt_style(color(:red), %r{^(\s*)(remotes/\S+)(.*)$}, 2)
             ])
-            list_result(ret, 'branches', from: from)
+            list_result(ret, 'branches', banner: banner, from: from)
             return
           else
             if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
@@ -1803,7 +1961,7 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               cmd << '-vv --no-abbrev --list'
               out, banner, from = source(io: true)
-              first = workspace.size > 1
+              first = from_base?('branch')
               grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
               ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
                 next line if stdin?
@@ -1876,9 +2034,7 @@ module Squared
 
         def restore(flag, opts = [], commit: nil, files: nil)
           cmd, opts = git_session('restore', shell_option(flag, commit, escape: false, force: false), opts: opts)
-          op = OptionPartition.new(opts,
-                                   OPT_GIT[:restore] + OPT_GIT[:log][:diff_context],
-                                   cmd,
+          op = OptionPartition.new(opts, OPT_GIT[:restore] + OPT_GIT[:log][:diff_context], cmd,
                                    project: self, strict: strict?, no: OPT_GIT[:no][:restore], first: matchpathspec)
           append_pathspec(op.extras + (files || []), pass: false)
           source(sync: false, stderr: true)
@@ -1907,8 +2063,7 @@ module Squared
           end
           list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
           op = OptionPartition.new(opts, list, cmd,
-                                   project: self,
-                                   strict: strict?,
+                                   project: self, strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
           op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
@@ -1933,8 +2088,8 @@ module Squared
               cmd << '--sq-quote'
               args = true
             end
-            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd,
-                                project: self, strict: strict?, no: OPT_GIT[:no][:rev_parse], args: args)
+            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd, project: self, strict: strict?, args: args,
+                                                                no: OPT_GIT[:no][:rev_parse])
                            .append(escape: args)
           end
           source(banner: verbose?)
@@ -1961,8 +2116,8 @@ module Squared
           op.add_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
-          ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
-          list_result(ret, flag.to_s, grep: op.extras, from: from)
+          ret = write_lines(out, grep: op.extras)
+          list_result(ret, flag.to_s, grep: op.extras, banner: banner, from: from)
         end
 
         def ls_files(flag, opts = [])
@@ -1972,7 +2127,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras)
-          list_result(ret, 'files', grep: op.extras, from: from)
+          list_result(ret, 'files', grep: op.extras, banner: banner, from: from)
         end
 
         def git(flag, opts = [], extras: [])
@@ -2147,10 +2302,10 @@ module Squared
           end
         end
 
-        def list_result(size, type, action: 'found', grep: [], from: nil)
+        def list_result(size, type, action: 'found', grep: [], banner: nil, from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-          elsif stdout?
+          elsif stdout? && (banner.nil? || (banner.is_a?(String) && !banner.empty?))
             styles = theme.fetch(:banner, []).reject { |val| val.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/((?<!l)e)?s\z/, '') : type}",
@@ -2174,15 +2329,15 @@ module Squared
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
-        def choice_commit(count: true, reflog: true, force: true, **kwargs)
+        def choice_commit(range = nil, count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
-          cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log')
+          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)
           case ret
           when Array
-            ret.map(&:stripstyle)
+            ret.map { |val| val&.stripstyle }
           when String
             ret.stripstyle
           else
@@ -2219,8 +2374,8 @@ module Squared
           append_submodules(target: target, from: from)
           return if !remote && opts.empty?
 
-          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target, project: self, strict: strict?,
-                                                                                       no: no)
+          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target,
+                                   project: self, strict: strict?, no: no)
           refspec = op.each_with_object([]) do |opt, out|
             if opt =~ op.values
               case $1
@@ -2267,9 +2422,9 @@ module Squared
           end
         end
 
-        def append_pathspec(files = [], target: @session, expect: false, **kwargs)
+        def append_pathspec(files = [], target: @session, expect: false, strict: strict?, **kwargs)
           if session_arg?('pathspec-from-file', target: target)
-            OptionPartition.clear(target, files, styles: theme[:inline])
+            OptionPartition.clear(target, files, strict: strict, styles: theme[:inline])
             true
           else
             option('pathspec', target: target) { |val| files = split_escape(val) } if files.empty?
@@ -2311,7 +2466,7 @@ module Squared
               end
             else
               target << case val
-                        when 'no', '0', 'false'
+                        when '0', 'false', 'no'
                           '--no-recurse-submodules'
                         when 'yes', 'on-demand'
                           "--recurse-submodules=#{val}"
@@ -2370,10 +2525,6 @@ module Squared
           ret
         end
 
-        def dryrun?(target: @session, prefix: target&.first, **)
-          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
-        end
-
         def quiet?(target: @session, **)
           return silent? unless target
 
@@ -2384,6 +2535,25 @@ module Squared
           basepath('.git', *args)
         end
 
+        def repofetch(origin = 'HEAD', branch: nil, sync: true)
+          format = if branch
+                     "%(if:equals=#{origin}/#{branch})%(upstream:short)"
+                   else
+                     "%(if)%(#{origin})"
+                   end
+          format += '%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
+          git_spawn 'fetch --no-tags --quiet' if sync
+          foreachref('heads', format: format).each do |line|
+            next if line.empty?
+
+            branch, origin, hint = line.split('...')
+            raise message('work tree is not usable', hint: hint[1..-2]) if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+
+            return [origin.empty? ? nil : origin, branch]
+          end
+          []
+        end
+
         def repotrack(origin, branch, quote: true)
           n = origin&.index('/')
           raise message("missing #{origin ? 'branch' : 'remote'} name", hint: origin) unless n && branch
@@ -2394,6 +2564,10 @@ module Squared
           ret
         end
 
+        def remotetrack
+          git_spawn('rev-parse --abbrev-ref @{u}').split('/', 2).first
+        end
+
         def commithash(val)
           val[/\A:(\h{5,40})\z/, 1]
         end