Stefan Karpinski <stefan.karpinski@xxxxxxxxx> writes: > CVS server was running the hook before the update action was > actually done. This performs the update before the hook is called. > > The original commit that introduced the current incorrect behavior > was 394d66d "git-cvsserver runs hooks/post-update". The error in > ordering of the hook call appears to have gone unnoticed, but since > git-cvsserver is supposed to emulate receive-pack, it stands to > reason that the hook should be run *after* the update. Since this > behavior is inconsistent with recieve-pack, users are either: > > 1) not using post-update hooks with git-cvsserver; > 2) using post-update hooks that don't care whether they are > called before or after the actual update occurs; > 3) using post-update hooks *only* with git-cvsserver, and > relying on the hook being called just before the update. > > This patch would affect only users in case 3. These users are > depending on fairly obviously wrong behavior, and moreover they can > simply change their current post-update into post-recieve hooks, > and their systems will work correctly again. > > Signed-off-by: Stefan Karpinski <stefan.karpinski@xxxxxxxxx> > --- > I'm CCing Andy Parkins, Michael Witten, and Junio Hamano, who > authored the other three commits implementing or affecting hooks in > git-cvsserver (394d66d, cdf6328, b2741f6). If you could please take > a look at this patch and comment on if it's harmful or not, it > would be much appreciated. I think I've seen this one before and I thought it was a sensible thing to do (and perhaps I even said so here). Is this a resend? If so, let's queue it in at least 'next' and see if anybody screams ;-). For a program near the fringe like cvsserver, not many people run it but the small number of people who run it gets hurt rather quickly if the updated behaviour breaks their existing practice, and sometimes breaking things for them would be the only way to extract any response. Yes, it is very unfortunate. > git-cvsserver.perl | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/git-cvsserver.perl b/git-cvsserver.perl > index c1e09ea..d2e6003 100755 > --- a/git-cvsserver.perl > +++ b/git-cvsserver.perl > @@ -1413,14 +1413,14 @@ sub req_ci > close $pipe || die "bad pipe: $! $?"; > } > > + $updater->update(); > + > ### Then hooks/post-update > $hook = $ENV{GIT_DIR}.'hooks/post-update'; > if (-x $hook) { > system($hook, "refs/heads/$state->{module}"); > } > > - $updater->update(); > - > # foreach file specified on the command line ... > foreach my $filename ( @committedfiles ) > { > -- > 1.6.0.3.3.g08dd8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html