45fcd4a429
- Fix a typo in git csh completion (non-existing label); use the normal if/then/endif now instead (forwarded request 220981 from tiwai) OBS-URL: https://build.opensuse.org/request/show/220982 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=130
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
---
|
|
contrib/completion/git-completion.tcsh | 7 ++-----
|
|
contrib/completion/git.csh | 4 ++++
|
|
contrib/completion/git.tcsh | 4 ++++
|
|
3 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
--- a/contrib/completion/git-completion.tcsh
|
|
+++ b/contrib/completion/git-completion.tcsh
|
|
@@ -34,8 +34,8 @@ if ( ${__git_tcsh_completion_version[1]}
|
|
endif
|
|
unset __git_tcsh_completion_version
|
|
|
|
-set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash
|
|
-set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash
|
|
+set __git_tcsh_completion_original_script = /etc/bash_completion.d/git.sh
|
|
+set __git_tcsh_completion_script = $RPM_BUILD_ROOT/usr/share/tcsh/git.complete
|
|
|
|
# Check that the user put the script in the right place
|
|
if ( ! -e ${__git_tcsh_completion_original_script} ) then
|
|
@@ -123,6 +123,3 @@ EOF
|
|
|
|
# Don't need this variable anymore, so don't pollute the users environment
|
|
unset __git_tcsh_completion_original_script
|
|
-
|
|
-complete git 'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,'
|
|
-complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,'
|
|
--- /dev/null
|
|
+++ b/contrib/completion/git.csh
|
|
@@ -0,0 +1,4 @@
|
|
+if (${?prompt}) then
|
|
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
|
|
+complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
|
|
+endif
|
|
--- /dev/null
|
|
+++ b/contrib/completion/git.tcsh
|
|
@@ -0,0 +1,4 @@
|
|
+if (${?prompt}) then
|
|
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
|
|
+complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
|
|
+endif
|