1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Commit graph

242 commits

Author SHA1 Message Date
Daniel Hahler
a1c1f6828c 35061: add __git_setup_diff_stage_options and use it with _git-diff-files and _git-diff explicitly 2015-05-14 19:00:32 +02:00
Daniel Hahler
fec4e7243b 35016: introduce new pretty formats %g[sdD] for reflog information 2015-05-14 18:56:23 +02:00
Daniel Hahler
b884853756 35060 + 35072: completion: git: split __git_heads into local and remote
It is useful to have this distinction visually.

This also uses `--format=%(refname:short)` directly with `git
for-each-ref`.
2015-05-12 00:59:07 +00:00
Daniel Shahaf
122bb9a125 34886: completion: git: Complete rebase --exec argument 2015-04-13 21:01:45 +00:00
Daniel Shahaf
7793ebcb71 34885: completion: git: Sort "commit object" completions most recent first 2015-04-13 20:59:19 +00:00
Daniel Shahaf
7929dd8cba 34885: completion: git: Fix another instance of the 34671 bug fixed in 34814 2015-04-13 20:59:02 +00:00
Daniel Hahler
ca8edaba92 34748: completion: git: update list of builtintools 2015-04-10 16:24:42 +00:00
Daniel Shahaf
727533088a 34814: completion: git: Fix bug introduced by 236da69
Based on a patch by Daniel Hahler <git@thequod.de>.
2015-04-01 09:44:26 +00:00
Daniel Hahler
0b79922edb 34762: completion: git: add short option for '--dir-diff' (_git-difftool) 2015-03-29 05:52:44 +00:00
Daniel Shahaf
e176eff554 34739: git completion: Fix regression in ce80a92
This restores the message when completing a commit object name that
isn't one of the most recent 20 commits.  e.g., 'git checkout deadbeef<TAB>'.
2015-03-19 06:51:32 +00:00
Daniel Shahaf
236da69842 34671 plus tweaks: Add -1 -2 -J -V -x to _describe, use them to sort 'git --fixup' hash completions 2015-03-16 09:27:06 +00:00
Daniel Shahaf
097dedf9ab 34671: git completion: only offer recent commits' tags/heads for --fixup 2015-03-16 09:25:39 +00:00
Daniel Hahler
ce80a925d6 34638 with tweaks: git completion: complete commit hashes and --fixup 2015-03-07 03:56:48 +00:00
Daniel Hahler
7d15b9a9cb 34468: completion: git: stash: handle 'save' being the default
"git stash" should complete arguments for "git stash save", but without
the message part.
2015-02-08 20:27:26 +01:00
Daniel Hahler
8f403ab25c 34467: completion: git: minor doc fixes
I am not sure about the deprecation of user-commands, but from other
places in the doc and commit history this deprecation was meant to be
reverted?!
2015-02-08 20:27:25 +01:00
Daniel Hahler
ffaf99288f 34469: git completion: add "stash" from refs/stash to __git_heads 2015-02-08 20:27:25 +01:00
Daniel Shahaf
a5333cc344 34444: git completion: minor improvements
- 'git rebase': complete arguments in the same word as the option

- 'git commit': provide message for --fixup/--squash
2015-02-02 15:32:59 +00:00
Wieland Hoffmann
9ca77b2143 _git: Change one --validate to --no-validate
As the description of that argument says, it's used to *not* perform
sanity checks.
2015-01-17 13:00:23 +01:00
Daniel Shahaf
c7850ac4f6 34042: _git: Respect tags for subcommand completion.
It is now possible to use the tag-order style to stagger the overwhelming
'git <TAB>' subcommand listing.  For example:

    zstyle ':completion::complete:git:argument-1:' tag-order \
        main-porcelain-commands user-commands third-party-commands \
        ancillary-manipulator-commands ancillary-interrogator-commands \
        plumbing-manipulator-commands plumbing-interrogator-commands \
        aliases
2015-01-05 15:57:42 +00:00
Peter Stephenson
9161a16b2e 33729: "git remote add" should complete local repositories 2014-11-23 21:03:37 +00:00
Oliver Kiddle
13fc579343 33467: correct return status on functions and numerous other minor fixes 2014-10-14 23:04:45 +02:00
Øystein Walle
95a6d965c5 33180: _git: add missing --3way option 2014-09-23 22:26:22 +02:00
Øystein Walle
93702691ec 33177: _git: fix typo in git-apply 2014-09-23 22:26:21 +02:00
Øystein Walle
d338cc5395 33178: _git: updates for Git 2.1.0
This incorporates changes mentioned in the release notes since 2.0.0.
2014-09-23 22:26:21 +02:00
Øystein Walle
56116a763a 33176: _git: Add missing --list to git-tag 2014-09-23 22:26:20 +02:00
Øystein Walle
8560d4ff31 33179: _git: updates for Git 2.0.0
This incorporates changes mentioned in the release notes since 1.9.0.
2014-09-23 22:26:20 +02:00
Marc Finet
089123f9e8 33150: completion git: fix send-email --confirm values 2014-09-14 12:02:38 +02:00
Marc Finet
ffd439b69b 33151: completion git: support aliases when \n exist
The git completion for aliases (i.e. completing with aliased verb)
was broken whem some \n exist in aliases.
2014-09-14 12:02:35 +02:00
Barton E. Schaefer
2e99ef809d un-transpose help text for git merge -{-no,}-verify 2014-08-24 08:43:40 -07:00
m0viefreak
cd2eb07a78 m0viefreak: users/18655,18657,18660: assorted auto-removable suffix fixes
Src/Zle/compresult.c, Src/Zle/zle_misc.c, Src/Zle/zle_refresh.c: fix
auto-removable suffix highlighting

Completion/Unix/Command/_git: fix compadd for auto-removable suffix in
_git_commit_ranges and _git_stash
2014-03-23 13:02:12 -07:00
Takeshi Banse
ab917d4a0e 32502: fix typo in argument list for git completio 2014-03-21 19:42:02 +00:00
Oliver Kiddle
079540cc78 users/18485: add .. as an auto-removable suffix in git revision ranges 2014-02-25 08:59:20 +01:00
m0viefreak
b97808fba2 32398: _git: completion updates up to latest git v1.9.0
- cherry-pick: allow commit ranges to be specified
- push: option is called --set-upstream and not --set-upstream-to
- status: offer -b,--branch when --porcelain or -z are given
  --porcelain and -z don't show the branch info by default, so it
  is needed to offer --branch for those options, too.
- checkout: add '--detach' option
- checkout: offer '-l' option when '--orphan' was given
- show-ref: update wording of --head and --heads according to man-page
- config: update default value for color.ui
  color-bool was changed to accept a default value as $parts[5]
- add support for 'cygstart' as a valid builtin browser on cygwin
- rebase: add suuport for --autostash and config.autostash
- update builtin browser list
- grep: add --{no,}textconv
- check-ignore: add --no-index
- update-ref: add --stdin -z
- add -C
- pull: add support for --rebase=preserve
- config: add support for http.*. options
- blame: -L can be given multiple times
- config: add support for http.savecookies
- push: add support for --force-with-lease
- diff: --diff-filter: allow lower-case variants (all-but ... specs)
- config: add support for 'fetch.prune' and 'remote.*.prune'
- check-ignore: -z: update message, check-attr: add -z
- config: add diff.orderfile
- revision options: add --exclude
- revision options: add --ignore-missing
- revision options: add --bisect
- rev-parse: add --stuck-long
- merge-base: add --fork-point
- config: implement submodule.*.update completion
- send-email: add --smtp-ssl-cert-path and config options
2014-02-18 12:22:21 +01:00
m0viefreak
f8e874ef9d 32397: _git: fix __git_submodules to only use the actual name of the submodule
The output of 'submodule status' is

Xsha1 name (describe)

X being one of -,+,U,[space]

We are only interested in the name part and not the whole line.

Fix the parameter expansions accordingly.
2014-02-18 12:22:21 +01:00
m0viefreak
139ee0e351 32395: _git: diff: refactor and fix wrong completions
Before this, there were several cases where the completion
would offer the wrong things:

$ git diff branch -- <tab>

would try to complete "changed in workdir files", but needs to
complete all "tree files in HEAD".

$ git diff --cached -- file1 file2 <tab>
would try to complete "changed in workdir files" but needs to
complete "changed in index files".

...

After this change all possible combinations are taken into
account and completion should work properly.
2014-02-18 12:22:16 +01:00
m0viefreak
946a99a0b3 32396: _git: fix __git_committish_range_{first,last} and __git_is_committish_range
- Ranges with 3 dots would always fail, because the non-greedy
  expansion  %..(.|)* in __git_committish_range_first would only
  remove '..' and never three dots. 'a...b' would end up in 'a.'.
  Use ${${1%..*}%.} instead.
- Use a similar approach for __git_committish_range_last.
- Wrap them in another expansion to replace empty results with 'HEAD'.
  Git man-page states omitted range ending are being replaced with
  HEAD. This rule has to be followed to make completions like
  'git log foo.. -- <tab>' work properly.
- Add an additional check to make sure none of the extracted first/last
  parts contain additional '..' in invalied ranges such as 'a..b..c'.
  This gets rid of the 'TODO:' and ideally saves a few unneded
  calls to git rev-parse.
2014-02-18 12:19:23 +01:00
Barton E. Schaefer
a2098b0b26 users/18368: compromise to restore partial path completion inadvertently removed by 31159 2014-01-27 21:54:13 -08:00
Hong Xu
567b494033 32069: completion for "git submodule update --remote" 2013-11-30 12:46:19 -08:00
Peter Stephenson
4163ebf4c7 unposted, see 32054: Rationalise character encoding.
Shell functions are strictly ASCII for maximum portability.

Other files within the distribution may contain UTF-8 characters.

Exception for test files: where they need single character input
with the top bit set, ISO-8859-X is used (X doesn't matter as
we don't need the Euro).
2013-11-27 15:56:44 +00:00
Øystein Walle
95a5ca90d9 31865: _git: Make --batch(-check) accept an argument
Also reword the explanation slightly to make it more compact since more
explanation is needed.
2013-10-21 17:40:13 +02:00
Øystein Walle
3d77fa789d 31864: _git: Add two sub-comamnds introduced in v1.8.4
Add _git-check-ignore() and _git-check-mailmap()
2013-10-21 17:40:12 +02:00
Øystein Walle
32ffba1214 31866: _git: Reword --heads to match new meaning 2013-10-21 17:40:09 +02:00
Øystein Walle
baee0a2295 31862: _git: Add status.short and status.branch 2013-10-21 17:40:07 +02:00
Øystein Walle
805b665901 31863: _git: Add new arguments introduced in Git v1.8.4 2013-10-21 17:40:03 +02:00
Øystein Walle
e91d90125b 31861: _git: Add git-clean -i/--interactive support
- Add -i and --interactive to _git-clean()
 - Add column.clean configuration variable
2013-10-21 17:40:01 +02:00
m0viefreak
7a37568b8c 31855: _git: revert: add '-e,--edit' 2013-10-21 17:39:59 +02:00
m0viefreak
2c1affc6c1 31856: _git: fix a few "undocumented" options
commit: '--null' is documented
relink: '-h,--help' are never documented for subcommands but always exist
verify-tag: '-v,--verbose' are documented with updated description
diff: '--cumulative' is deprecated -> remove
2013-10-21 17:39:57 +02:00
Øystein Walle
07ca60acf4 31858: _git: fix wrong default value 2013-10-21 17:39:56 +02:00
m0viefreak
80cb8e947f 31857: _git: Remove unsupported -q option from diff options 2013-10-21 17:39:53 +02:00
Øystein Walle
5585b95f3c 31859: _git: re-order the last two git-blame arguments
The proper syntax is git blame [<commit>] <file> where <commit> is optional.
2013-10-21 17:39:50 +02:00