Merge branch 'sg/complete-untracked-filter'

jrn · jrn · commit b7f571618cde · 2013-09-24T23:27:44.000-07:00
* 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
@@ -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 ()

Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,7 @@ _git_add ()`
`901`	`901`	`esac`
`902`	`902`
`903`	`903`	`# XXX should we check for --update and --all options ?`
`904`		`- __git_complete_index_file "--others --modified"`
	`904`	`+ __git_complete_index_file "--others --modified --directory --no-empty-directory"`
`905`	`905`	`}`
`906`	`906`
`907`	`907`	`_git_archive ()`
`@@ -1063,7 +1063,7 @@ _git_clean ()`
`1063`	`1063`	`esac`
`1064`	`1064`
`1065`	`1065`	`# XXX should we check for -x option ?`
`1066`		`- __git_complete_index_file "--others"`
	`1066`	`+ __git_complete_index_file "--others --directory"`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`	`1069`	`_git_clone ()`