diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
| commit | f798f13b0eba1f31cd2d760441ac9d36a6ac5263 (patch) | |
| tree | 2015479d9fcda696f4b91235bc21bf539ebb6a7c /Completion/Unix/Command | |
| parent | 52f72086c93d4b5faec06665bc352246d3f4ec3f (diff) | |
| parent | 7d7242405a82332716b5fdba68f32ecabf6349be (diff) | |
| download | zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.gz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.zip | |
Fix merge conflict
Diffstat (limited to 'Completion/Unix/Command')
| -rw-r--r-- | Completion/Unix/Command/_git | 11 | ||||
| -rw-r--r-- | Completion/Unix/Command/_rm | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index a2cbf74d0..b082bb050 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5526,9 +5526,12 @@ __git_remote_branch_names_noprefix () { __git_commits () { # TODO: deal with things that __git_heads and __git_tags has in common (i.e., # if both exists, they need to be completed to heads/x and tags/x. + local -a sopts ropt + zparseopts -E -a sopts S: r:=ropt R: q + sopts+=( $ropt:q ) _alternative \ - 'heads::__git_heads' \ - 'commit-tags::__git_commit_tags' \ + "heads::__git_heads $sopts" \ + "commit-tags::__git_commit_tags $sopts" \ 'commit-objects::__git_commit_objects' } @@ -5595,10 +5598,12 @@ __git_commits2 () { (( $+functions[__git_commit_ranges] )) || __git_commit_ranges () { + local -a suf if compset -P '*..(.|)'; then __git_commits $* else - __git_commits $* -qS .. + compset -S '..*' || suf=( -qS .. -r '.@~ ^:' ) + __git_commits $* $suf fi } diff --git a/Completion/Unix/Command/_rm b/Completion/Unix/Command/_rm index 20f44afc5..1f156c481 100644 --- a/Completion/Unix/Command/_rm +++ b/Completion/Unix/Command/_rm @@ -32,13 +32,9 @@ _arguments -C $opts \ case $state in (file) - declare -a ignored - ignored=() - ((CURRENT > 1)) && - ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) - ((CURRENT < $#line)) && - ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) - _files -F ignored && ret=0 + line[CURRENT]=() + line=( ${line//(#m)[\[\]()\\*?#<>~\^\|]/\\$MATCH} ) + _files -F line && ret=0 ;; esac |