summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git12
2 files changed, 6 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index ed8a7796f..37eb6baa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-02 Clint Adams <clint@zsh.org>
+
+ * Mikael Magnusson: 25594: Completion/Unix/Command/_git:
+ "git clean" cleanup.
+
2008-09-01 Clint Adams <clint@zsh.org>
* Mikael Magnusson: 25591: Completion/Unix/Command/_git:
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index bdd16d93b..fa8274d44 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -435,16 +435,6 @@ _git-checkout-index () {
'*::file:__git_cached_files' && ret=0
}
-(( $+functions[_git-clean] )) ||
-_git-clean () {
- _arguments \
- '-d[remove untracked directories]' \
- '-n[just show what would be done]' \
- '-q[be quiet, only report errors]' \
- '(-X -x)-x[do use ignore rules]' \
- '(-X -x)-X[remove only files ignored by git]' && ret=0
-}
-
(( $+functions[_git-commit-tree] )) ||
_git-commit-tree () {
if (( CURRENT == 2 )); then
@@ -1601,7 +1591,7 @@ _git-cherry-pick () {
(( $+functions[_git-clean] )) ||
_git-clean () {
- _arguments -S \
+ _arguments -S -s \
'-d[also remove untracked directories]' \
'-n[do a dry run]' \
'-f[required when clean.requireForce is true (default)]' \