From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2007 05:51:03 +0000 (-0700)
Subject: Merge branch 'je/hooks'
X-Git-Tag: v1.5.4-rc0~421
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/91d4b2ee816b565d298ee65fcf11d5aecd2d67dc?ds=inline;hp=-c

Merge branch 'je/hooks'

* je/hooks:
Added example hook script to save/restore permissions/ownership.
Add post-merge hook, related documentation, and tests.
---

91d4b2ee816b565d298ee65fcf11d5aecd2d67dc
diff --combined git-merge.sh
index cde09d4d60,66e48b3b18..6c513dcbdf
--- a/git-merge.sh
+++ b/git-merge.sh
@@@ -97,6 -97,19 +97,19 @@@ finish () 
  		fi
  		;;
  	esac
+ 
+ 	# Run a post-merge hook
+         if test -x "$GIT_DIR"/hooks/post-merge
+         then
+ 	    case "$squash" in
+ 	    t)
+                 "$GIT_DIR"/hooks/post-merge 1
+ 		;;
+ 	    '')
+                 "$GIT_DIR"/hooks/post-merge 0
+ 		;;
+ 	    esac
+         fi
  }
  
  merge_name () {
@@@ -122,7 -135,7 +135,7 @@@
  case "$#" in 0) usage ;; esac
  
  have_message=
 -while case "$#" in 0) break ;; esac
 +while test $# != 0
  do
  	case "$1" in
  	-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\