git: update to 3.36.0 & rebase patches & use CYGWIN_CHOST
Removes git-1.9.0-manifest-msys2.patch as it is already applied upstream as fe90397604f9f9695b3fa0b8b11d9f93533b655f Signed-off-by: Christopher Degawa <ccom@randomderp.com>
This commit is contained in:
@@ -1,14 +1,6 @@
|
||||
---
|
||||
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.4.6/contrib/completion/git-completion.tcsh
|
||||
===================================================================
|
||||
--- git-2.4.6.orig/contrib/completion/git-completion.tcsh
|
||||
+++ git-2.4.6/contrib/completion/git-completion.tcsh
|
||||
@@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]}
|
||||
--- a/contrib/completion/git-completion.tcsh
|
||||
+++ b/contrib/completion/git-completion.tcsh
|
||||
@@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]} < 6 || \
|
||||
endif
|
||||
unset __git_tcsh_completion_version
|
||||
|
||||
@@ -30,28 +22,10 @@ Index: git-2.4.6/contrib/completion/git-completion.tcsh
|
||||
|
||||
cat << EOF >! ${__git_tcsh_completion_script}
|
||||
#!bash
|
||||
@@ -121,6 +121,3 @@ EOF
|
||||
@@ -122,6 +122,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.4.6/contrib/completion/git.csh
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ git-2.4.6/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.4.6/contrib/completion/git.tcsh
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ git-2.4.6/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
|
||||
|
||||
Reference in New Issue
Block a user