Antonio Teixeira
b80926ddde
* "git checkout --ours" (no other arguments) complained that the
option is incompatible with branch switching, which is technically
correct, but found confusing by some users. It now says that the
user needs to give pathspec to specify what paths to checkout.
* It has been documented that we avoid "VAR=VAL shell_func" and why.
* "git add -p" by users with diff.suppressBlankEmpty set to true
failed to parse the patch that represents an unmodified empty line
with an empty line (not a line with a single space on it), which
has been corrected.
* "git rebase --help" referred to "offset" (the difference between
the location a change was taken from and the change gets replaced)
incorrectly and called it "fuzz", which has been corrected.
* "git notes add -m '' --allow-empty" and friends that take prepared
data to create notes should not invoke an editor, but it started
doing so since Git 2.42, which has been corrected.
* An expensive operation to prepare tracing was done in re-encoding
code path even when the tracing was not requested, which has been
corrected.
* Perforce tests have been updated.
* The credential helper to talk to OSX keychain sometimes sent
garbage bytes after the username, which has been corrected.
* A recent update broke "git ls-remote" used outside a repository,
which has been corrected.
* "git config --value=foo --fixed-value section.key newvalue" barfed
when the existing value in the configuration file used the
valueless true syntax, which has been corrected.
* "git reflog expire" failed to honor annotated tags when computing
reachable commits.
* A flakey test and incorrect calls to strtoX() functions have been
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=656
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
|