This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Changes not appearing on glibc-cvs or libc-alpha


Roland McGrath wrote:
> I have been occasionally lax in posting my simple changes.  Sorry
> about that.  Frankly I don't think it matters much at all for the
> obvious changes, but I don't have any quarrel with a universal policy
> of posting all changes.
>
>> One example is <http://sourceware.org/ml/glibc-cvs/2012-q3/msg00291.html>
>> - I see no sign of the contents of commit
>> 1ec79f2673f862a3b3b2e83aec8fb56b78db4a87 having appeared in any glibc-cvs
>> message, and nothing on libc-alpha.
>
> I have no idea about the commit email.  I've never really tried to
> understand the script that does that.  The only guess I have is that
> they may have been commits that I previously pushed to a roland/foo
> branch and then merged to master without a rebase.  I know that some
> git commit email regimes I've seen sometimes say, "These commits were
> already on another branch, so not sending those diffs."  But I don't
> think that was the case with the commit you mentioned.
>
> Jim Meyering is responsibe for the script we use, so perhaps he can
> offer some insight.

Hi Roland,

I don't have much time now, but I did take a quick look.
The script that does this is hook/post-receive, which does no
more than to invoke ~meyering/shared/post-receive-email.  That
was a slightly dated version of the script copied from git's own
contrib/hooks/ directory.  I glanced through the diffs, and
they all look like improvements (albeit nothing affecting the
issue in question), so I have updated the script to the latest
from git.git's master.

The top of the script has this comment (same as before):

# hooks.diffopts
#   Alternate options for the git diff-tree invocation that shows changes.
#   Default is "--stat --summary --find-copies-harder". Add -p to those
#   options to include a unified diff of changes in addition to the usual
#   summary output.

I confirmed that diffopts was currently not set:

    $ git --git-dir=/git/glibc.git config -l|grep diffop
    $

Then, I set it to include "-p", as suggested:

    $ git --git-dir=/git/glibc.git config hooks.diffopts \
      '--stat --summary --find-copies-harder -p'

If someone accidentally unset the hooks.diffopts config variable
that would explain why we were not seeing diffs.

HTH


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]