From patchwork Sun Nov 18 11:44:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Waldenborg X-Patchwork-Id: 10687751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0086714D6 for ; Sun, 18 Nov 2018 11:45:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E488529EC7 for ; Sun, 18 Nov 2018 11:45:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D911D29ECB; Sun, 18 Nov 2018 11:45:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9317229EC9 for ; Sun, 18 Nov 2018 11:45:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727259AbeKRWGD (ORCPT ); Sun, 18 Nov 2018 17:06:03 -0500 Received: from 0x63.nu ([109.74.10.199]:54748 "EHLO 0x63.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726643AbeKRWGD (ORCPT ); Sun, 18 Nov 2018 17:06:03 -0500 Received: from localhost ([127.0.0.1] helo=moveme2.lan) by 0x63.nu with esmtp (Exim 4.89) (envelope-from ) id 1gOLVw-0003J7-UW; Sun, 18 Nov 2018 12:45:21 +0100 From: Anders Waldenborg To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Anders Waldenborg Subject: [PATCH v3 0/5] %(trailers) improvements in pretty format Date: Sun, 18 Nov 2018 12:44:22 +0100 Message-Id: <20181118114427.1397-1-anders@0x63.nu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181104152232.20671-1-anders@0x63.nu> References: <20181104152232.20671-1-anders@0x63.nu> X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: anders@0x63.nu X-SA-Exim-Scanned: No (on 0x63.nu); SAEximRunCond expanded to false Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Updated since v2: * Allow trailing colon in 'key=' argument * Clarify documentation on how matching is done * Rename option to "valueonly" * Make trailing matching a callback function * Avoid copying match string * Simplify generation of "expected" in tests * Rename function to strbuf_expand_literal_cb * cocci suggested fixes Anders Waldenborg (5): pretty: single return path in %(trailers) handling pretty: allow showing specific trailers pretty: add support for "valueonly" option in %(trailers) strbuf: separate callback for strbuf_expand:ing literals pretty: add support for separator option in %(trailers) Documentation/pretty-formats.txt | 26 ++++++++--- pretty.c | 68 ++++++++++++++++++++++------ strbuf.c | 21 +++++++++ strbuf.h | 8 ++++ t/t4205-log-pretty-formats.sh | 78 ++++++++++++++++++++++++++++++++ trailer.c | 25 ++++++++-- trailer.h | 4 ++ 7 files changed, 206 insertions(+), 24 deletions(-)