From: Junio C Hamano Date: Fri, 23 Feb 2007 18:32:39 GMT Subject: Re: git-push hook to update remote working copy safely Message-ID: <7v649s4tdk.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Johannes Schindelin writes: > Don't you have any user interaction? I.e. if the remote working directory > is only ever changed by your hook, you can use what Junio sent. It is even > overkill for that purpose. And it even has a bug (perhaps more, but I know of at least one). The comparison after running merge-base should compare the merge base and the old commit object name.