Accepting request 220982 from devel:tools:scm

- 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
This commit is contained in:
Tomáš Chvátal 2014-02-07 09:25:52 +00:00 committed by Git OBS Bridge
parent 5c40df9005
commit 45fcd4a429
2 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,8 @@
--- ---
contrib/completion/git-completion.tcsh | 7 ++----- contrib/completion/git-completion.tcsh | 7 ++-----
contrib/completion/git.csh | 5 +++++ contrib/completion/git.csh | 4 ++++
contrib/completion/git.tcsh | 5 +++++ contrib/completion/git.tcsh | 4 ++++
3 files changed, 12 insertions(+), 5 deletions(-) 3 files changed, 10 insertions(+), 5 deletions(-)
--- a/contrib/completion/git-completion.tcsh --- a/contrib/completion/git-completion.tcsh
+++ b/contrib/completion/git-completion.tcsh +++ b/contrib/completion/git-completion.tcsh
@ -26,17 +26,15 @@
-complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,' -complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,'
--- /dev/null --- /dev/null
+++ b/contrib/completion/git.csh +++ b/contrib/completion/git.csh
@@ -0,0 +1,5 @@ @@ -0,0 +1,4 @@
+if (! ${?prompt}) goto end +if (${?prompt}) then
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
+complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,' +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
+done: +endif
+
--- /dev/null --- /dev/null
+++ b/contrib/completion/git.tcsh +++ b/contrib/completion/git.tcsh
@@ -0,0 +1,5 @@ @@ -0,0 +1,4 @@
+if (! ${?prompt} || ! ${?tcsh}) goto end +if (${?prompt}) then
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
+complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,' +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
+end: +endif
+

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 5 14:08:04 CET 2014 - tiwai@suse.de
- Fix a typo in git csh completion (non-existing label);
use the normal if/then/endif now instead
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 30 15:03:34 UTC 2014 - jengelh@inai.de Thu Jan 30 15:03:34 UTC 2014 - jengelh@inai.de