From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Josh England" Subject: Re: [PATCH] Add post-merge hook. Date: Tue, 04 Sep 2007 13:36:13 -0600 Message-ID: <1188934573.6192.35.camel@beauty> References: <11885136172952-git-send-email-jjengla@sandia.gov> <7v7inc7hao.fsf@gitster.siamese.dyndns.org> <1188923110.6192.15.camel@beauty> <7vmyw2ny05.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: "Junio C Hamano" X-From: git-owner@vger.kernel.org Tue Sep 04 21:35:30 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1ISeBJ-00076o-1h for gcvg-git@gmane.org; Tue, 04 Sep 2007 21:35:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbXIDTfU (ORCPT ); Tue, 4 Sep 2007 15:35:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752310AbXIDTfU (ORCPT ); Tue, 4 Sep 2007 15:35:20 -0400 Received: from mm03snlnto.sandia.gov ([132.175.109.20]:2802 "EHLO sentry.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbXIDTfT (ORCPT ); Tue, 4 Sep 2007 15:35:19 -0400 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.1)); Tue, 04 Sep 2007 13:35:08 -0600 X-Server-Uuid: AA8306FD-23D1-4E5B-B133-B2D9F10C3631 Received: from [132.175.2.191] (beauty.son.sandia.gov [132.175.2.191]) by mailgate.sandia.gov (8.14.0/8.14.0) with ESMTP id l84JZ3kL000930; Tue, 4 Sep 2007 13:35:04 -0600 In-Reply-To: <7vmyw2ny05.fsf@gitster.siamese.dyndns.org> X-Mailer: Evolution 2.10.1 X-PMX-Version: 5.3.3.310218, Antispam-Engine: 2.5.2.313940, Antispam-Data: 2007.9.4.121723 X-PerlMx-Spam: Gauge=IIIIIII, Probability=7%, Report='BODY_SIZE_600_699 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __pbl.spamhaus.org_TIMEOUT ' X-TMWD-Spam-Summary: TS=20070904193510; SEV=2.2.2; DFV=B2007090415; IFV=2.0.4,4.0-9; AIF=B2007090415; RPD=5.02.0125; ENG=IBF; RPDID=7374723D303030312E30413031303230322E34364444423336442E303046433A53434A535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE X-MMS-Spam-Filter-ID: B2007090415_5.02.0125_4.0-9 X-WSS-ID: 6AC36CE63HO1251806-01-01 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, 2007-09-04 at 10:25 -0700, Junio C Hamano wrote: > "Josh England" writes: > > >> Two questions. > >> > >> * Do you want to run the post-merge hook even for a squash > >> merge? > > > > Yes. I'd like to run it at any time that the working tree might be > > updated. > > If that is the case, perhaps your hook may want to get a > parameter to tell it what kind of "git-merge" invocation it was? > Squash merge does not even advance the HEAD and is of a very > different nature from a normal merge. OK. Should it just pass in a flag (squash or normal), or are there other merge types it should need to know about. -JE