Re: [PATCH] cg-commit: Fix a typo that would inhibit running of post-commit script:

[Jim Meyering <jim@meyering.net>]

Jonas Fonseca <fonseca@diku.dk> wrote:
> Jim Meyering <jim@meyering.net> wrote Thu, Aug 24, 2006:
>> I tried cg-commit with a commit hook, but the hook never ran.
>> The problem was a typo:
>>
>> Fix a typo that would inhibit running the post-commit script:
>> s/commit-post/post-commit/.
>
> If I remember correctly, historically, the commit-post existed before
> the post-commit appeared. You can see that it is documented in the man
> page so it is not a typo.
>
> However, this should certainly be updated, but I think a better fix
> would be to transitionally warn the user about the existence of the
> commit-post hook before using it in favour of post-commit.

How about this?
Check for both and if there's exactly one, use that.
If it's the old one, give a diagnostic suggesting to rename it.
If both exist, execute neither, give a diagnostic and fail.

If you like this, I'll prepare a patch.

>> diff --git a/cg-commit b/cg-commit
>> index 9d3b1a1..82eea60 100755
>> --- a/cg-commit
>> +++ b/cg-commit
>> @@ -604,15 +604,16 @@ if [ "$newhead" ]; then
>>  		branchname="$(cat "$_git/branch-name")"
>>  	fi
>>  	[ -z "$branchname" ] && [ "$_git_head" != "master" ] && branchname="$_git_head"
>> -	if [ -x "$_git/hooks/post-commit" -a ! "$no_hooks" ]; then
>> +	post_commit="$_git/hooks/post-commit"
>> +	if [ -x "$post_commit" -a ! "$no_hooks" ]; then
>>  		if [ "$(git-repo-config --bool cogito.hooks.commit.post.allmerged)" = "true" ]; then
>>  			# We just hope that for the initial commit, the user didn't
>>  			# manage to install the hook yet.
>>  			for merged in $(git-rev-list $newhead ^$oldhead | tac); do
>> -				"$_git/hooks/post-commit" "$merged" "$branchname"
>> +				"$post_commit" "$merged" "$branchname"
>>  			done
>>  		else
>> -			"$_git/hooks/post-commit" "$newhead" "$branchname"
>> +			"$post_commit" "$newhead" "$branchname"
>>  		fi
>>  	fi
>
> The patch looks more like a refactoring of a previous commit that did
> the commit-post -> post-commit replacement.

Exactly :)