completion: difftool takes both revs and files

artagnon · gitster · commit d8517cc6670d · 2013-06-03T10:30:04.000-07:00
'git difftool' is clearly a frontend to 'git diff' and is used in
exactly the same way, but it uses a misleadingly named completion
function __git_complete_file.  It happens to work only because it
calls __git_complete_revlist_file that completes both revs and
paths.

Change it to use __git_complete_revlist_file, just like 'git diff'.

Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1294,7 +1294,7 @@ _git_difftool ()
 		return
 		;;
 	esac
-	__git_complete_file
+	__git_complete_revlist_file
 }
 
 __git_fetch_options="

Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ _git_difftool ()`
`1294`	`1294`	`return`
`1295`	`1295`	`;;`
`1296`	`1296`	`esac`
`1297`		`- __git_complete_file`
	`1297`	`+ __git_complete_revlist_file`
`1298`	`1298`	`}`
`1299`	`1299`
`1300`	`1300`	`__git_fetch_options="`