summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git12
2 files changed, 5 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 95c4aeb2e..138336e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2018-01-04 dana <dana@dana.is>
+ * 43974: Completion/Unix/Command/_git: Always offer -F/-m for
+ `git tag`
+
* 43970, 43971: Etc/creating-a-release.txt, NEWS: Document some
changes in 5.{4,5,6} not previously mentioned, clarify that
process in release instructions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 093464625..0ebbbe861 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2017,15 +2017,6 @@ _git-subtree () {
(( $+functions[_git-tag] )) ||
_git-tag () {
- local -a message_opts
-
- if (( words[(I)-[asu]] )); then
- message_opts=(
- '(-m --message -F --file)'{-m+,--message=}'[specify tag message]:message'
- '(-m --message -F --file)'{-F+,--file=}'[read tag message from given file]:message file:_files'
- )
- fi
-
_arguments \
- creation \
'(-a --annotate -s --sign -u --local-user)'{-a,--annotate}'[create an unsigned, annotated tag]' \
@@ -2035,7 +2026,8 @@ _git-tag () {
'(-f --force)'{-f,--force}'[replace existing tag]' \
'--create-reflog[create a reflog]' \
'--cleanup=[cleanup message]:mode:((verbatim\:"no cleanup" whitespace\:"remove leading and trailing whitespace" strip\:"remove leading and trailing whitespace and comments"))' \
- $message_opts \
+ '(-m --message -F --file)'{-F+,--file=}'[read tag message from given file]:message file:_files' \
+ '(-m --message -F --file)'{-m+,--message=}'[specify tag message]:message' \
': :__git_tags' \
':: :__git_commits' \
- deletion \