Dirk Mueller
483dbc7bc8
* Revert the "git patch-id" change that went into 2.46.1,
as it seems to have got a regression reported (I haven't verified,
but it is better to keep a known breakage than adding an unintended
regression).
* In a few corner cases "git diff --exit-code" failed to report
"changes" (e.g., renamed without any content change), which has
been corrected.
* The interpret-trailers command failed to recognise the end of the
message when the commit log ends in an incomplete line.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=658
58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
---
|
|
contrib/completion/git-completion.tcsh | 17 +++++++----------
|
|
contrib/completion/git.csh | 4 ++++
|
|
contrib/completion/git.tcsh | 4 ++++
|
|
3 files changed, 15 insertions(+), 10 deletions(-)
|
|
|
|
Index: git-2.11.0/contrib/completion/git-completion.tcsh
|
|
===================================================================
|
|
--- git-2.11.0.orig/contrib/completion/git-completion.tcsh
|
|
+++ git-2.11.0/contrib/completion/git-completion.tcsh
|
|
@@ -32,14 +32,14 @@ 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 = /usr/share/bash-completion/completions/git
|
|
+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
|
|
- echo "git-completion.tcsh: Cannot find: ${__git_tcsh_completion_original_script}. Git completion will not work."
|
|
- exit
|
|
-endif
|
|
+# # Check that the user put the script in the right place
|
|
+# if ( ! -e ${__git_tcsh_completion_original_script} ) then
|
|
+# echo "git-completion.tcsh: Cannot find: ${__git_tcsh_completion_original_script}. Git completion will not work."
|
|
+# exit
|
|
+# endif
|
|
|
|
cat << EOF >! ${__git_tcsh_completion_script}
|
|
#!bash
|
|
@@ -121,6 +121,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}"`,'
|
|
Index: git-2.11.0/contrib/completion/git.csh
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ git-2.11.0/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
|
|
Index: git-2.11.0/contrib/completion/git.tcsh
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ git-2.11.0/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
|