Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint

gitster · gitster · commit 4eea8e3fa0c4 · 2015-03-28T09:33:15.000-07:00
Code clean-up.

* sg/completion-gitcomp-nl-for-refs:
  completion: use __gitcomp_nl() for completing refs
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -977,7 +977,7 @@ _git_branch ()
 
 	case "$cur" in
 	--set-upstream-to=*)
-		__gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"
+		__gitcomp_nl "$(__git_refs)" "" "${cur##--set-upstream-to=}"
 		;;
 	--*)
 		__gitcomp "
@@ -1045,7 +1045,7 @@ _git_checkout ()
 
 _git_cherry ()
 {
-	__gitcomp "$(__git_refs)"
+	__gitcomp_nl "$(__git_refs)"
 }
 
 _git_cherry_pick ()

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ _git_branch ()`
`977`	`977`
`978`	`978`	`case "$cur" in`
`979`	`979`	`--set-upstream-to=*)`
`980`		`- __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"`
	`980`	`+ __gitcomp_nl "$(__git_refs)" "" "${cur##--set-upstream-to=}"`
`981`	`981`	`;;`
`982`	`982`	`--*)`
`983`	`983`	`__gitcomp "`
`@@ -1045,7 +1045,7 @@ _git_checkout ()`
`1045`	`1045`
`1046`	`1046`	`_git_cherry ()`
`1047`	`1047`	`{`
`1048`		`- __gitcomp "$(__git_refs)"`
	`1048`	`+ __gitcomp_nl "$(__git_refs)"`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`_git_cherry_pick ()`