From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 05:24:22 +0000 (+0900)
Subject: Merge branch 'dm/run-command-ignored-hook-advise'
X-Git-Tag: v2.16.0-rc0~169
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/130b512e62dd4cdd4c5d35700438b19b81cec00e?hp=-c

Merge branch 'dm/run-command-ignored-hook-advise'

A hook script that is set unexecutable is simply ignored.  Git
notifies when such a file is ignored, unless the message is
squelched via advice.ignoredHook configuration.

* dm/run-command-ignored-hook-advise:
run-command: add hint when a hook is ignored
---

130b512e62dd4cdd4c5d35700438b19b81cec00e
diff --combined contrib/completion/git-completion.bash
index 0e16f017a4,a331ccc556..fcd83311a3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1385,7 -1385,7 +1385,7 @@@ _git_describe (
  		__gitcomp "
  			--all --tags --contains --abbrev= --candidates=
  			--exact-match --debug --long --match --always --first-parent
 -			--exclude
 +			--exclude --dirty --broken
  			"
  		return
  	esac
@@@ -2350,6 -2350,7 +2350,7 @@@ _git_config (
  		advice.rmHints
  		advice.statusHints
  		advice.statusUoption
+ 		advice.ignoredHook
  		alias.
  		am.keepcr
  		am.threeWay