threads / patch / 5377

patchcg-commit: Fix a typo that would inhibit running of post-commit script:

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

## tl;dr

4 messages between Aug 24, 2006 and Sep 24, 2006. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Jim Meyering· Aug 24, 2006, 18:19 UTC · lore

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/.

Signed-off-by: Jim Meyering <jim@meyering.net>
---
 cg-commit |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Show changes to cg-commit +4 −3

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

-- 
1.4.1.1

Jonas Fonseca· Aug 25, 2006, 00:20 UTC · re: Jim Meyering · lore

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

Jim Meyering <jim@meyering.net> wrote Thu, Aug 24, 2006:

Show 5 quoted lines

> 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.

Show 23 quoted lines

> 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.

-- 
Jonas Fonseca

Jim Meyering· Sep 16, 2006, 15:10 UTC · re: Jonas Fonseca · lore

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

Jonas Fonseca <fonseca@diku.dk> wrote:

Show 14 quoted lines

> 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.

Show 26 quoted lines

>> 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 :)

Petr Baudis· Sep 24, 2006, 17:39 UTC · re: Jim Meyering · lore

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

Dear diary, on Sat, Sep 16, 2006 at 05:10:36PM CEST, I got a letter where Jim Meyering <jim@meyering.net> said that...

Show 22 quoted lines

> 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.

That would be awesome. :-)

Thanks in advance,

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)