[PATCH] The "table-of-contents" in the update hook script should match the body

[PATCH] The "table-of-contents" in the update hook script should match the body

[Andy Parkins]

44478d99ee0 introduced a filter using "git-rev-parse --not --all" to the
log display to prevent the display of revisions already in the
repository.  However, the table of contents generation didn't get that
same update.

This patch fixes that.  The table of contents before the log and the log
now both display the same list of revisions.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
---
Apologies.  I should always wait a day before posting patches.

 templates/hooks--update |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/hooks--update b/templates/hooks--update
index a7cf604..fd1f73d 100644
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -57,7 +57,7 @@ announcerecipients=$(git-repo-config hooks.announcelist)
 allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
 
 # --- Check types
-newrev_type=$(git-cat-file -t "$newrev")
+newrev_type=$(git-cat-file -t $newrev)
 
 case "$refname","$newrev_type" in
 	refs/tags/*,commit)
@@ -165,7 +165,7 @@ case "$refname_type" in
 			baserev=$(git-merge-base $oldrev $newrev)
 
 			# Commit with a parent
-			for rev in $(git-rev-list $newrev ^$baserev)
+			for rev in $(git-rev-parse --not --all | git-rev-list --stdin $newrev ^$baserev)
 			do
 				revtype=$(git-cat-file -t "$rev")
 				echo "       via  $rev ($revtype)"
-- 
1.5.0.rc4.365.g5eff6-dirty

Re: [PATCH] The "table-of-contents" in the update hook script should match the body

[Junio C Hamano]

Andy Parkins <andyparkins@gmail.com> writes:

> 44478d99ee0 introduced a filter using "git-rev-parse --not --all" to the
> log display to prevent the display of revisions already in the
> repository.  However, the table of contents generation didn't get that
> same update.
>
> This patch fixes that.  The table of contents before the log and the log
> now both display the same list of revisions.
>
> Signed-off-by: Andy Parkins <andyparkins@gmail.com>
> ---
> Apologies.  I should always wait a day before posting patches.

No worries.  I will always wait a day before applying yours ;-)

Just kidding.  It's not a big deal as this is purely a sample
script.

>  templates/hooks--update |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/templates/hooks--update b/templates/hooks--update
> index a7cf604..fd1f73d 100644
> --- a/templates/hooks--update
> +++ b/templates/hooks--update
> @@ -57,7 +57,7 @@ announcerecipients=$(git-repo-config hooks.announcelist)
>  allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
>  
>  # --- Check types
> -newrev_type=$(git-cat-file -t "$newrev")
> +newrev_type=$(git-cat-file -t $newrev)
>  
>  case "$refname","$newrev_type" in
>  	refs/tags/*,commit)

I do not think this hunk is related...

Re: [PATCH] The "table-of-contents" in the update hook script should match the body

[Andy Parkins]

On Wednesday 2007 February 14 16:53, Junio C Hamano wrote:

> > -newrev_type=$(git-cat-file -t "$newrev")
> > +newrev_type=$(git-cat-file -t $newrev)
> >
> >  case "$refname","$newrev_type" in
> >  	refs/tags/*,commit)
>
> I do not think this hunk is related...

Oops; yes you're right.  I was having trouble with git-cvsserver calling the 
update hook; and that was the fix.  However, it's nothing to do with that 
patch - and I suspect that that fix should more properly be in git-cvsserver.


Andy


-- 
Dr Andy Parkins, M Eng (hons), MIEE
andyparkins@gmail.com