From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Sep 2013 06:27:44 +0000 (-0700)
Subject: Merge branch 'sg/complete-untracked-filter'
X-Git-Tag: v1.8.5-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7f571618cdec4fee19a06576ea40859b7398c69?hp=40b77322d2bffc7d513d1540ae127a08e84aadcb

Merge branch 'sg/complete-untracked-filter'

* sg/complete-untracked-filter:
completion: improve untracked directory filtering for filename completion
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e1b7313072..86f77345fd 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -901,7 +901,7 @@ _git_add ()
 	esac
 
 	# XXX should we check for --update and --all options ?
-	__git_complete_index_file "--others --modified"
+	__git_complete_index_file "--others --modified --directory --no-empty-directory"
 }
 
 _git_archive ()
@@ -1063,7 +1063,7 @@ _git_clean ()
 	esac
 
 	# XXX should we check for -x option ?
-	__git_complete_index_file "--others"
+	__git_complete_index_file "--others --directory"
 }
 
 _git_clone ()