That is interesting, so in the case of a non-ff push, there is no way
for a pre-push hook to know what is being pushed in order to run?
Steve
On Thu, Mar 10, 2016 at 4:43 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Stephen Morton <stephen.c.mor...@gmail.com> writes:
>
>> The sample pre-push hook provided with git [1] will crash if the local
>> repo is not up to date with the remote as $remote_sha is not present
>> in the local repo. I'm not sure if this patch is exactly correct, it's
>> just provided as an example.
>>
>> Given that people are likely crafting their own solutions based on the
>> examples, it's probably good to get right.
>
> It's probably good to get right, but I do not think use of @{u} is
> making it right, unfortunately. You may not necessarily have @{u}
> configured, and you may not even pushing to the configured remote
> branch.
>
> The spirit of the sample hook, I think, is to validate the new
> commits you are publishing, so if you cannot even determine which
> ones are new and which ones are not, failing the "push" by exiting
> with non-zero status is the right behaviour for this sample.
>
> So perhaps something like this may be more appropriate as an
> example.
>
> templates/hooks--pre-push.sample | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/templates/hooks--pre-push.sample
> b/templates/hooks--pre-push.sample
> index 6187dbf..7ef6780 100755
> --- a/templates/hooks--pre-push.sample
> +++ b/templates/hooks--pre-push.sample
> @@ -41,7 +41,12 @@ do
> fi
>
> # Check for WIP commit
> - commit=`git rev-list -n 1 --grep '^WIP' "$range"`
> + commit=`git rev-list -n 1 --grep '^WIP' "$range"` || {
> + # we do not even know about the range...
> + echo >&2 "Non-ff update to $remote_ref"
> + echo >&2 "fetch from there first"
> + exit 1
> + }
> if [ -n "$commit" ]
> then
> echo >&2 "Found WIP commit in $local_ref, not pushing"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
