Skip to content
  • Jeff King's avatar
    log: re-encode commit messages before grepping · 04deccda
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    If you run "git log --grep=foo", we will run your regex on
    the literal bytes of the commit message. This can provide
    confusing results if the commit message is not in the same
    encoding as your grep expression (or worse, you have commits
    in multiple encodings, in which case your regex would need
    to be written to match either encoding). On top of this, we
    might also be grepping in the commit's notes, which are
    already re-encoded, potentially leading to grepping in a
    buffer with mixed encodings concatenated. This is insanity,
    but most people never noticed, because their terminal and
    their commit encodings all match.
    
    Instead, let's massage the to-be-grepped commit into a
    standardized encoding. There is not much point in adding a
    flag for "this is the encoding I expect my grep pattern to
    match"; the only sane choice is for it to use the log output
    encoding. That is presumably what the user's terminal is
    using, and it means that the patterns found by the grep will
    match the output produced by git.
    
    As a bonus, this fixes a potential segfault in commit_match
    when commit->buffer is NULL, as we now build on logmsg_reencode,
    which handles reading the commit buffer from disk if
    necessary. The segfault can be triggered with:
    
            git commit -m 'text1' --allow-empty
            git commit -m 'text2' --allow-empty
            git log --graph --no-walk --grep 'text2'
    
    which arguably does not make any sense (--graph inherently
    wants a connected history, and by --no-walk the command line
    is telling us to show discrete points in history without
    connectivity), and we probably should forbid the
    combination, but that is a separate issue.
    
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    04deccda