squared 0.7.3 → 0.7.5

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

@@ -164,27 +164,27 @@ module Squared
           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,
           diff: {
-            base: %w[0 1|base 2|ours 3|theirs].freeze,
+            base: %w[0 1|base 2|ours 3|theirs cached merge-base].freeze,
             show: %w[s exit-code histogram].freeze
           }.freeze,
           fetch: {
             base: %w[multiple porcelain progress P|prune-tags refetch stdin u|update-head-ok
-                     recurse-submodules-default=b].freeze,
+                     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
           }.freeze,
           git: {
-            add: %w[N|intent-to-add refresh].freeze,
+            add: %w[N|intent-to-add].freeze,
             blame: %w[b c l s t w C=im? L=q M=im? S=p color-by-age color-lines first-parent incremental line-porcelain
                       p|porcelain root score-debug f|show-name e|show-email n|show-number show-stats abbrev=i contents=p
-                      date=q encoding=b ignore-rev=b ignore-revs-file=p reverse=q].freeze,
+                      date=q diff-algorithm=b encoding=b ignore-rev=b ignore-revs-file=p reverse=q].freeze,
             clean: %w[d x X f|force n|dry-run i|interactive q|quiet e|exclude=q].freeze,
             grep: %w[e f=p h H I O=bm r all-match and G|basic-regexp break cached column c|count E|extended-regexp
                      l|files-with-matches L|files-without-match F|fixed-strings full-name W|function-context heading
                      i|ignore-case v|invert-match n|line-number name-only no-index not z|null o|only-matching or
                      P|perl-regexp q|quiet recurse-submodules p|show-function a|text untracked w|word-regexp
-                     A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=i
+                     A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=n
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
             revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
@@ -197,26 +197,26 @@ module Squared
             base: %w[L=qm all all-match alternate-refs author-date-order basic-regexp bisect boundary cherry cherry-mark
                      cherry-pick clear-decorations date-order dense do-walk exclude-first-parent-only E|extended-regexp
                      first-parent F|fixed-strings follow full-diff full-history ignore-missing invert-grep left-only
-                     log-size merge no-max-parents no-min-parents not P|perl-regexp reflog 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,
+                     log-size maximal-only merge no-max-parents no-min-parents not P|perl-regexp reflog
+                     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,
             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,
             diff: %w[p R u z B=bm? C=bm? l=im G=qm I=qm M=bm? O=qm S=qm binary check compact-summary cumulative
-                     find-copies-harder full-index W|function-context w|ignore-all-space ignore-blank-lines
-                     ignore-cr-at-eol ignore-space-at-eol b|ignore-space-change D|irreversible-delete 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?
+                     default-prefix find-copies-harder full-index W|function-context w|ignore-all-space
+                     ignore-blank-lines ignore-cr-at-eol ignore-space-at-eol b|ignore-space-change D|irreversible-delete
+                     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?
-                     find-object=b find-renames=b? ignore-matching-lines=q ignore-submodules=b? line-prefix=q 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 submodule=b?
-                     word-diff=b? word-diff-regex=q ws-error-highlight=b].freeze,
+                     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
+                     submodule=b? word-diff=b? word-diff-regex=q ws-error-highlight=b].freeze,
             diff_context: %w[U=im inter-hunk-context=i unified=i].freeze
           }.freeze,
           ls_files: %w[f t v z debug deduplicate directory eol error-unmatch exclude-standard full-name i|ignored
@@ -227,10 +227,12 @@ 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,
+          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
                      f|force-rebase ignore-date ignore-whitespace i|interactive keep-base m|merge no-ff q|quiet quit
                      reset-author-date root show-current-patch signoff v|verbose empty=b x|exec=q gpg-sign=b? onto=b
-                     r|rebase-merges=b s|strategy=b X|strategy-option=b whitespace=b].freeze,
+                     r|rebase-merges=b s|strategy=b X|strategy-option=b trailer=q whitespace=b].freeze,
           reset: %w[N pathspec-file-nul q|quiet pathspec-from-file=p].freeze,
           restore: %w[ignore-skip-worktree-bits ignore-unmerged m|merge ours p|patch pathspec-file-nul q|quiet S|staged
                       theirs W|worktree conflict=b pathspec-from-file=p s|source=b].freeze,
@@ -258,8 +260,9 @@ module Squared
                      ignored=b? porcelain=b? untracked-files=b?].freeze,
           submodule: {
             status: %w[cached recursive].freeze,
-            update: %w[checkout f|force init merge N|no-fetch no-recommend-shallow no-single-branch recommend-shallow
-                       rebase recursive remote single-branch depth=i filter=q jobs=i reference=b ref-format=q].freeze,
+            update: %w[checkout f|force init merge progress N|no-fetch no-recommend-shallow no-single-branch
+                       recommend-shallow rebase recursive remote single-branch depth=i filter=q jobs=i name=q
+                       reference=q ref-format=q].freeze,
             branch: %w[b|branch d|default].freeze,
             sync: %w[recursive].freeze
           }.freeze,
@@ -333,10 +336,11 @@ module Squared
           'checkout' => %i[commit branch track detach path].freeze,
           'commit' => %i[add all amend amend-orig fixup].freeze,
           'diff' => %i[head branch files view between contain].freeze,
+          'range-diff' => %i[view between contain].freeze,
           'fetch' => %i[origin remote all].freeze,
           'files' => %i[cached modified deleted others].freeze,
           'git' => %i[add blame clean grep mv revert rm sparse-checkout status].freeze,
-          'log' => %i[view grep between contain].freeze,
+          'log' => %i[grep view between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote all].freeze,
           'rebase' => %i[branch onto send].freeze,
@@ -503,7 +507,7 @@ module Squared
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
-                  when 'log', 'diff'
+                  when 'log', 'diff', 'range-diff'
                     case flag
                     when :view, :between, :contain
                       if action == 'log' && flag == :view
@@ -529,22 +533,25 @@ module Squared
                           end
                           log!(flag, args, index: index)
                         end
-                      else
-                        format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
-                        task flag, [:commit1, :commit2] do |_, args|
-                          commit1 = commithead args.commit1
-                          range = if commit1
-                                    commit2 = commithead param_guard(action, flag, args: args, key: :commit2)
-                                    args = args.extras
-                                    [commit1, commit2]
-                                  else
-                                    range, opts, refs = choice_commit(multiple: flag == :view ? true : 2,
-                                                                      values: %w[Options Pathspec])
-                                    args = OptionPartition.strip(opts)
-                                    args.concat(refs.shellsplit) if refs
-                                    range.reverse
-                                  end
-                          __send__(action == 'log' ? :log! : :diff, flag, args, range: range)
+                        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)
                         end
                       end
                     when :head
@@ -615,7 +622,6 @@ module Squared
                       format_desc action, flag, 'name,create?=[bB],commit?,d/etach?'
                       task flag, [:name, :create, :commit, :detach] do |_, args|
                         if (branch = args.name)
-                          branch = param_guard(action, flag, args: args, key: :name)
                           create = args.create
                           detach = if args.commit == 'd'
                                      commit = nil
@@ -632,7 +638,7 @@ module Squared
                                      commit = commithead args.commit
                                      args.detach
                                    end
-                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\A[Bb]\z/) if create
+                          param_guard(action, flag, args: { create: create }, key: :create, pat: /^[Bb]$/) if create
                         else
                           branch = choice_refs 'Choose a branch to switch'
                         end
@@ -798,15 +804,13 @@ module Squared
                       task flag, [:mode, :ref] do |_, args|
                         mode = param_guard(action, flag, args: args, key: :mode)
                         ref = commithead args.ref
-                        ref = choice_commit(reflog: false) if ref == ':'
-                        reset(flag, mode: mode, ref: ref)
+                        reset(flag, mode: mode, ref: ref == ':' ? choice_commit(reflog: false) : ref)
                       end
                     when :patch
                       format_desc action, flag, 'ref/:,pathspec*'
                       task flag, [:ref] do |_, args|
                         ref = commithead args.ref
-                        ref = choice_commit(reflog: false) unless ref && ref != ':'
-                        reset(flag, refs: args.extras, ref: ref)
+                        reset(flag, refs: args.extras, ref: !ref || ref == ':' ? choice_commit(reflog: false) : ref)
                       end
                     end
                   when 'show'
@@ -858,15 +862,25 @@ module Squared
                         rebase(flag, args, commit: commit, upstream: upstream, branch: branch)
                       end
                     when :commit, :'no-commit'
-                      format_desc action, flag, 'refs+,opts*'
-                      task flag do |_, args|
-                        args = args.to_a
-                        if args.empty?
-                          accept = "Merge with #{`#{git_output('branch --show-current')}`.chomp}?"
-                          branch, opts = choice_refs('Choose a branch', values: 'Options', accept: accept)
-                          args = OptionPartition.strip(opts)
+                      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 = choice_refs('Choose a branch', accept: "#{action.capitalize}?") if branch == ':'
+                          opts = args.extras
+                          if has_value!(opts, 'ours')
+                            opts << 's=ort' << 'X=ours'
+                          elsif has_value!(opts, 'theirs')
+                            opts << 's=ort' << 'X=theirs'
+                          end
+                        else
+                          branch, opts = choice_refs('Choose a branch', values: 'Options',
+                                                                        accept: "Merge with #{current}?")
+                          opts = OptionPartition.strip(opts)
                         end
-                        merge(flag, args, branch: branch)
+                        raise ArgumentError, 'nothing to merge' if current == branch
+
+                        merge(flag, opts, branch: branch)
                       end
                     when :send
                       format_desc(action, flag, VAL_GIT[action.to_sym][:send], arg: nil)
@@ -930,7 +944,7 @@ module Squared
                                  args.extras
                                else
                                  commit, opts, files = choice_commit(values: ['Options', ['Pathspec', true]])
-                                 files = files&.shellsplit
+                                 files &&= files.shellsplit
                                  OptionPartition.strip(opts)
                                end
                         restore(flag, args, commit: commit, files: files)
@@ -1031,13 +1045,10 @@ module Squared
                 end
                 printsucc
               end
-              op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
-              reg = if op.empty?
-                      []
-                    else
-                      opts = op.uniq(opts)
-                      matchmap op
-                    end
+              op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, strict: strict?,
+                                                                  no: OPT_GIT[:no][:pull])
+              opts -= op.extras
+              reg = matchmap op
               session_done op.target
               heads = []
               cur = nil
@@ -1081,7 +1092,8 @@ module Squared
           when :branch
             return unless upstream
 
-            op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
+            op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, strict: strict?,
+                                                                  no: OPT_GIT[:no][:rebase])
             op << upstream
             append_head op.shift&.delete_prefix(':')
             op.clear(pass: false)
@@ -1185,10 +1197,11 @@ module Squared
               list.concat(collect_hash(OPT_GIT[:log]))
               no = collect_hash OPT_GIT[:no][:log]
             end
-            op = OptionPartition.new(opts, list, cmd, project: self, no: no, first: (matchpathspec if flag == :push))
+            op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: no,
+                                                      first: (matchpathspec if flag == :push))
             case flag
             when :push
-              op.append?('message', readline('Enter message', force: true), force: true) if op.remove(':')
+              op.readline('Enter message', option: 'message', quote: true) if op.remove(':')
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1209,7 +1222,7 @@ module Squared
               elsif !op.empty?
                 op.add_first(prefix: ':')
               elsif flag == :branch
-                raise_error ArgumentError, 'no branch name'
+                raise ArgumentError, 'no branch name'
               end
               op.clear
             when :clear
@@ -1239,7 +1252,8 @@ module Squared
         def status(flag = nil, opts = [])
           cmd, opts = git_session('status', opts: opts)
           if flag
-            op = OptionPartition.new(opts, OPT_GIT[:status], cmd, project: self, no: OPT_GIT[:no][:status])
+            op = OptionPartition.new(opts, OPT_GIT[:status], cmd, project: self, strict: strict?,
+                                                                  no: OPT_GIT[:no][:status])
             append_pathspec op.extras
           else
             cmd << (option('long') ? '--long' : '--short')
@@ -1309,7 +1323,7 @@ module Squared
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || { pass: true }
           case flag
           when :build
-            op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
+            op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self, strict: strict?)
             op.clear(append: true)
             args = op.to_a
           else
@@ -1354,7 +1368,8 @@ module Squared
           case flag
           when :commit, :index
             op = OptionPartition.new(opts, OPT_GIT[:reset] + VAL_GIT[:reset] + OPT_GIT[:log][:diff_context], cmd,
-                                     project: self, no: OPT_GIT[:no][:reset], first: (matchpathspec if flag == :index))
+                                     project: self, strict: strict?, no: OPT_GIT[:no][:reset],
+                                     first: (matchpathspec if flag == :index))
             if flag == :commit
               op.append(commit)
                 .clear(pass: false)
@@ -1399,7 +1414,7 @@ module Squared
             cmd << '--detach' << commit
           else
             op = OptionPartition.new(opts, OPT_GIT[:checkout] + OPT_GIT[:log][:diff_context], cmd,
-                                     project: self, no: OPT_GIT[:no][:checkout],
+                                     project: self, strict: strict?, no: OPT_GIT[:no][:checkout],
                                      first: (matchpathspec if flag == :path))
             if flag == :path
               append_head
@@ -1422,6 +1437,7 @@ module Squared
               cmd << '--annotate'
             end
             cmd << '--force' if option('f', 'force')
+            option('trailer') { |val| cmd << quote_option('trailer', val) }
             if !commit && message && (sha = commithash(message))
               commit = sha
               message = nil
@@ -1433,7 +1449,8 @@ module Squared
             cmd << '--delete'
             append_value refs
           else
-            op = OptionPartition.new(opts, OPT_GIT[:tag], cmd << '--list', project: self, no: OPT_GIT[:no][:tag])
+            op = OptionPartition.new(opts, OPT_GIT[:tag], cmd << '--list', project: self, strict: strict?,
+                                                                           no: OPT_GIT[:no][:tag])
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
@@ -1448,7 +1465,7 @@ 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,
+          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
@@ -1464,13 +1481,16 @@ module Squared
           source(exception: false)
         end
 
-        def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [])
-          cmd, opts = git_session('diff', opts: opts)
-          op = OptionPartition.new(opts,
-                                   collect_hash(OPT_GIT[:diff]) + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context],
-                                   cmd,
-                                   project: self, no: OPT_GIT[:no][:log][:diff],
-                                   first: (matchpathspec unless flag == :files))
+        def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [], from: :diff)
+          cmd, opts = git_session(from, opts: opts)
+          list = if from == :'range-diff'
+                   OPT_GIT[:range_diff]
+                 else
+                   no = OPT_GIT[:no][:log][:diff]
+                   collect_hash(OPT_GIT[:diff]) + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
+                 end
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: no,
+                                                    first: (matchpathspec unless flag == :files))
           case flag
           when :files, :view, :between, :contain
             op.delete('--cached')
@@ -1512,10 +1532,10 @@ module Squared
             patch = basepath patch.delete_prefix('>')
             exit 1 if patch.exist? && !confirm_basic('Overwrite?', patch)
             op << '>' << shell_quote(patch)
-            source(banner: false)
+            source(banner: false, from: from)
             puts patch.read if patch.exist? && (stdin? || verbose?)
           else
-            source(exception: op.arg?('exit-code'))
+            source(exception: op.arg?('exit-code'), from: from)
           end
         end
 
@@ -1526,7 +1546,7 @@ module Squared
             pathspec = if flag == :all || ((fixup || amend) && refs.size == 1 && refs.first == '*')
                          '--all'
                        elsif (refs = projectmap(refs)).empty?
-                         raise_error 'no qualified pathspec'
+                         raise 'no qualified pathspec'
                        else
                          "-- #{refs.join(' ')}"
                        end
@@ -1547,7 +1567,7 @@ module Squared
           upstream = nil
           cmd, opts = git_session('add', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:add] + OPT_GIT[:log][:diff_context], cmd,
-                                   project: self, no: OPT_GIT[:no][:add], first: matchpathspec)
+                                   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'
@@ -1616,14 +1636,16 @@ module Squared
           display = false
           case flag
           when :commit, :'no-commit'
-            op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
+            op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, strict: strict?,
+                                                                 no: OPT_GIT[:no][:merge])
             op << "--#{flag}"
             op.delim
             if branch
               op << branch
               op.clear(pass: false)
             else
-              raise_error ArgumentError, 'no branch/commit' if op.empty?
+              raise ArgumentError, 'no branch/commit' if op.empty?
+
               append_commit(*op.extras)
             end
           else
@@ -1691,7 +1713,7 @@ module Squared
             return
           when :list
             op = OptionPartition.new(opts, OPT_GIT[:branch], cmd << '--list',
-                                     project: self, no: OPT_GIT[:no][:branch], single: /\Av+\z/)
+                                     project: self, strict: strict?, no: OPT_GIT[:no][:branch], single: /\Av+\z/)
             op.each { |val| op.add_quote(val) }
             out, banner, from = source(io: true)
             print_item banner
@@ -1742,7 +1764,7 @@ module Squared
           cmd, opts = git_session('switch', opts: opts)
           cmd << '--force' if option('f', 'force')
           if flag == :branch
-            OptionPartition.new(opts, OPT_GIT[:switch], cmd, project: self, no: OPT_GIT[:no][:switch])
+            OptionPartition.new(opts, OPT_GIT[:switch], cmd, project: self, strict: strict?, no: OPT_GIT[:no][:switch])
                            .add_quote(branch)
           else
             case flag
@@ -1766,7 +1788,7 @@ module Squared
 
         def submodule(flag, opts = [], branch: nil, path: nil, url: nil)
           cmd, opts = git_session('submodule', opts: opts)
-          op = OptionPartition.new(opts, OPT_GIT[:submodule].fetch(flag, []), cmd, project: self)
+          op = OptionPartition.new(opts, OPT_GIT[:submodule].fetch(flag, []), cmd, project: self, strict: strict?)
           case flag
           when :branch, :url
             op.adjoin("set-#{flag}")
@@ -1784,7 +1806,7 @@ module Squared
           op = OptionPartition.new(opts,
                                    OPT_GIT[:restore] + OPT_GIT[:log][:diff_context],
                                    cmd,
-                                   project: self, no: OPT_GIT[:no][:restore], first: matchpathspec)
+                                   project: self, strict: strict?, no: OPT_GIT[:no][:restore], first: matchpathspec)
           append_pathspec(op.extras + (files || []), pass: false)
           source(sync: false, stderr: true)
         end
@@ -1813,6 +1835,7 @@ module Squared
           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?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
           op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
@@ -1837,7 +1860,8 @@ module Squared
               cmd << '--sq-quote'
               args = true
             end
-            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd, project: self, no: OPT_GIT[:no][:rev_parse], args: args)
+            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd,
+                                project: self, strict: strict?, no: OPT_GIT[:no][:rev_parse], args: args)
                            .append(escape: args)
           end
           source(banner: verbose?)
@@ -1846,7 +1870,7 @@ module Squared
         def sparse_checkout(flag, opts = [])
           cmd, opts = git_session('sparse-checkout', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:sparse_checkout].fetch(flag, []), cmd,
-                                   project: self, no: OPT_GIT[:no][:sparse_checkout][flag])
+                                   project: self, strict: strict?, no: OPT_GIT[:no][:sparse_checkout][flag])
           case flag
           when :add
             append_pathspec(op.detach, expect: true, resolve: false, pass: false)
@@ -1860,7 +1884,7 @@ module Squared
         def ls_remote(flag, opts = [], remote: nil)
           cmd, opts = git_session('ls-remote --refs', opts: opts)
           cmd << "--#{flag}" unless flag == :remote
-          op = OptionPartition.new(opts, OPT_GIT[:ls_remote], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_GIT[:ls_remote], cmd, project: self, strict: strict?)
           op.add_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
@@ -1870,7 +1894,7 @@ module Squared
 
         def ls_files(flag, opts = [])
           cmd, opts = git_session("ls-files --#{flag}", opts: opts)
-          op = OptionPartition.new(opts, OPT_GIT[:ls_files], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_GIT[:ls_files], cmd, project: self, strict: strict?)
           op.splice(path: true, pattern: true)
           out, banner, from = source(io: true)
           print_item banner
@@ -1889,35 +1913,38 @@ module Squared
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GIT[:no][flag], single: /\A\d+\z/,
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?,
+                                                    no: OPT_GIT[:no][flag], single: /\A\d+\z/,
                                                     first: case flag
                                                            when :blame, :revert, :'sparse-checkout' then nil
                                                            else matchpathspec
                                                            end)
           case flag
           when :blame
-            raise_error Errno::ENOENT, 'no file target' unless (n = op.index { |s| basepath(s).file? })
+            raise Errno::ENOENT, 'no file target' unless (n = op.index { |s| basepath(s).file? })
+
             op.append(basepath(op.remove_at(n)), delim: true)
               .clear
           when :revert
             if op.arg?(*VAL_GIT[:rebase][:send])
               op.clear
             elsif op.empty?
-              raise_error 'no commit target'
+              raise 'no commit target'
             else
               append_commit(*op.extras)
             end
           when :add
-            if flag == :add && !op.arg?('pathspec-from-file')
+            unless op.arg?('pathspec-from-file')
               grep, pathspec = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !pathspec.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = status_data.map do |a, b|
-                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = status_data
+                  .map do |a, b|
+                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                  "#{sub_style(b, color(:red))} #{a}"
-                end
-                .compact
+                    "#{sub_style(b, color(:red))} #{a}"
+                  end
+                  .compact
                 unless files.empty?
                   files = choice_index('Select files', files, multiple: true, trim: /^\S+\s/,
                                                               accept: [accept_y('Add?')])
@@ -1928,15 +1955,21 @@ module Squared
             return source(git_session('status -s'), banner: false) unless append_pathspec(op.extras)
           when :mv
             refs = projectmap op.extras
-            raise_error 'no source/destination' unless refs.size > 1
+            raise 'no source/destination' unless refs.size > 1
+
             op.merge(refs)
           when :rm, :clean, :'sparse-checkout'
             append_pathspec(op.extras, expect: flag != :clean, resolve: flag != :'sparse-checkout')
           when :grep
+            delim = false
             op.each do |val|
-              if op.include?('--')
+              if val == '--'
+                delim = true
+                op.delim
+              elsif delim
                 op.add_path(val)
               elsif op.exist?(val, glob: true)
+                delim = true
                 op.delim
                   .add_path(val)
               else
@@ -2103,7 +2136,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, 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
@@ -2161,11 +2195,11 @@ module Squared
               target << '--' << files.join(' ')
               true
             elsif expect
-              raise_error(if expect.is_a?(String)
-                            expect
-                          else
-                            kwargs[:parent] ? 'pathspec not present' : 'pathspec not within worktree'
-                          end)
+              raise(if expect.is_a?(String)
+                      expect
+                    else
+                      kwargs[:parent] ? 'pathspec not present' : 'pathspec not within worktree'
+                    end)
             else
               false
             end
@@ -2222,7 +2256,7 @@ module Squared
           dir = worktree ? [quote_option('work-tree', path), quote_option('git-dir', gitpath)] : []
           return session('git', *dir, *cmd, **kwargs) unless opts
 
-          op = OptionPartition.new(opts, OPT_GIT[:common], dir, project: self)
+          op = OptionPartition.new(opts, OPT_GIT[:common], dir, project: self, strict: strict?)
           [session('git', *op.to_a, *cmd, **kwargs), op.extras]
         end