From patchwork Sun Jan 6 00:26:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nickolai Belakovski X-Patchwork-Id: 10749423 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 B00C313B5 for ; Sun, 6 Jan 2019 00:26:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 995892886A for ; Sun, 6 Jan 2019 00:26:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AD3B28879; Sun, 6 Jan 2019 00:26:34 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 239DB2886A for ; Sun, 6 Jan 2019 00:26:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726372AbfAFA03 (ORCPT ); Sat, 5 Jan 2019 19:26:29 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:33612 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbfAFA03 (ORCPT ); Sat, 5 Jan 2019 19:26:29 -0500 Received: by mail-pl1-f195.google.com with SMTP id z23so19119465plo.0 for ; Sat, 05 Jan 2019 16:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3fy2CpAC5z+cQL3I2385dlC2wqncLfghP0tGT57ZDAg=; b=q9Rf+/DOUj0bG+QT9whmDY8TGnwy7rZiozeN5rmt4rnDvHIR5QcEJm8sY9eKKAEZph lu2J1opW7qrAj9g7XUw273GUKxj9VZy/tMQBJQczL9M8P0VebLFdnaem0kkGQnYvIWBI VhW1ArlSxzF5UrXwmhSt9iqhaHiaxayhEbkr+mRt/iRQA85dLNvjNgM3uLpgRvX1Mzi3 BpTzcXzSgj/ZF4M1c0mbVfOuMp5O4j29Oq3XzWcO5SPKuhoVUor8aGXUEl3xMs5KQppM JfR4MjIhO9ctbEYVXWPPlhrEcJfG8/eBKTqBguzA1t2VLXt0eoREUOOAdhx18PxxwVSK M1vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3fy2CpAC5z+cQL3I2385dlC2wqncLfghP0tGT57ZDAg=; b=HdEnFMXaR/1YIgM4FbWtrpfShY5Gj3XfwVpybUHPT6+YDGas6FsriynJVnVgypoosw 3edATirrmA+pYjzQXUuhp3X9C3v/0AQKm2ODgLrxT42N80ycyGX3MsKC9YowCJdIRhfm t5++pLL4A+BMio7vKmyTFNXfe5kEemRKkRLWYPCZ12vxflgWzQhn8uT6knbDGb0tokDL PuSEyEcc4wJ8F7qbEMPSTg3t+TvVGPXtk9VsogM1yNSAH+6FF1xi8KYH+ffi9PRuIKUm Bfby0x/kLraknmo84JzlE+xYNchE47YpkaqFVg/zNHS9yFM/knFUKHGlQesQcejwHiyQ pfag== X-Gm-Message-State: AJcUukc7BjjaclX2CSXLQE4o+PdovVX+b2l5P6ThV6LR4HYZHARRBTU6 5HqbuPWUNITftkT6x28dZvsgo5SS X-Google-Smtp-Source: ALg8bN7lRLn6vyB1NdSGsirFMDpiCCBNRbhh9l1wGGWOI8HYoi1EeRH4CoJtU2ABSM0evfxaTsFB7A== X-Received: by 2002:a17:902:7481:: with SMTP id h1mr56877949pll.341.1546734388100; Sat, 05 Jan 2019 16:26:28 -0800 (PST) Received: from localhost.localdomain (cpe-23-241-199-231.socal.res.rr.com. [23.241.199.231]) by smtp.gmail.com with ESMTPSA id e16sm85376485pfn.46.2019.01.05.16.26.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Jan 2019 16:26:27 -0800 (PST) From: nbelakovski@gmail.com To: git@vger.kernel.org Cc: peff@peff.net, rafa.almas@gmail.com, gitster@pobox.com, avarab@gmail.com, Nickolai Belakovski Subject: [PATCH v5 0/3] Date: Sat, 5 Jan 2019 16:26:16 -0800 Message-Id: <20190106002619.54741-1-nbelakovski@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nickolai Belakovski Replying to my original email to try to clean up the email chain > Thanks for keeping with this. I think we're getting quite close Thanks to you as well for continuing to review the change set and provide feedback! It does feel rather close, I'm getting exciting about following it through, even if we just end up merging the worktreepath commit and not the ones to modify the branch output, since I can always just make a local alias that uses the worktreepath atom. The last set of changes all made sense, very non-controversial, so I've simply implemented them. Beyond that, I moved where the structures for the ref<->worktree map are defined now that they're no longer associated with used_atom. They still feel a little awkwardly placed to me; I couldn't quite find a way I liked of arranging them together while also sticking to the style in the rest of the code but I think it's a little better that all of the relevant structs and the cmpfnc are all in the same place. Travis-CI results: https://travis-ci.org/nbelakovski/git/builds/475825245 Nickolai Belakovski (3): ref-filter: add worktreepath atom branch: Mark and color a branch differently if it is checked out in a linked worktree branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree Documentation/git-branch.txt | 20 ++++++----- Documentation/git-for-each-ref.txt | 5 +++ builtin/branch.c | 16 ++++++--- ref-filter.c | 71 ++++++++++++++++++++++++++++++++++++++ t/t3200-branch.sh | 8 ++--- t/t3203-branch-output.sh | 21 +++++++++++ t/t6302-for-each-ref-filter.sh | 15 ++++++++ 7 files changed, 140 insertions(+), 16 deletions(-)