Merge branch 'af/tcsh-completion-noclobber' into maint

gitster · gitster · commit ada9ecd98947 · 2015-07-15T11:41:18.000-07:00
The tcsh completion writes a bash scriptlet but that would have
failed for users with noclobber set.

* af/tcsh-completion-noclobber:
  git-completion.tcsh: fix redirect with noclobber
diff --git a/contrib/completion/git-completion.tcsh b/contrib/completion/git-completion.tcsh
@@ -41,7 +41,7 @@ if ( ! -e ${__git_tcsh_completion_original_script} ) then
 	exit
 endif
 
-cat << EOF > ${__git_tcsh_completion_script}
+cat << EOF >! ${__git_tcsh_completion_script}
 #!bash
 #
 # This script is GENERATED and will be overwritten automatically.

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ if ( ! -e ${__git_tcsh_completion_original_script} ) then`
`41`	`41`	`exit`
`42`	`42`	`endif`
`43`	`43`
`44`		`-cat << EOF > ${__git_tcsh_completion_script}`
	`44`	`+cat << EOF >! ${__git_tcsh_completion_script}`
`45`	`45`	`#!bash`
`46`	`46`	`#`
`47`	`47`	`# This script is GENERATED and will be overwritten automatically.`