git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] branch: support configuring --sort via .gitconfig

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Aug 16, 2018, 08:56 UTC
Message-ID
<CAPig+cR5cu3cxtpdHsbSSK7xWRpMQh_sv5nvunZrojAOkFeedg@mail.gmail.com>
In-Reply-To
<20180816080549.33544-1-samuel.maftoul@gmail.com>
On Thu, Aug 16, 2018 at 4:06 AM <samuel.maftoul@gmail.com> wrote:
Show 13 quoted lines
> Add support for configuring default sort ordering for git branches. Command
> line option will override this configured value, using the exact same
> syntax.
>
> Signed-off-by: Samuel Maftoul <samuel.maftoul@gmail.com>
> ---
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> @@ -1034,6 +1034,12 @@ branch.autoSetupRebase::
> +branch.sort::
> +       This variable controls the sort ordering of branches when displayed by
> +       linkgit:git-branch[1]. Without the "--sort=<value>" option provided, the
> +       value of this variable will be used as the default.
> +       See linkgit:git-for-each-ref[1] field names for valid values.

Thanks for adding some information about what values are valid for this config variable.

Show 8 quoted lines
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> @@ -272,6 +272,9 @@ start-point is either a local or remote-tracking branch.
>         full refname (including `refs/...` prefix). This lists
>         detached HEAD (if present) first, then local branches and
>         finally remote-tracking branches.
> +       Sort order defaults to the value configured for the `branch.sort`
> +       variable if it exists, or lexicographic order otherwise. See
> +       linkgit:git-config[1].

This change still has problems pointed out by my earlier review[1]. The existing text in git-branch.txt says:

    Sort order defaults to sorting based on the
    full refname...

Which is both redundant with the new text you add and seems to say something rather different.

Show 10 quoted lines
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> @@ -1305,4 +1305,51 @@ test_expect_success 'tracking with unexpected .fetch refspec' '
> +test_expect_success 'invalid sort parameter in configuration' '
> +       (
> +               cd sort &&
> +               git config branch.sort "v:notvalid" &&
> +               test_must_fail git branch
> +
> +       )
> +'
See my earlier review[1] regarding the unnecessary blank line in this new test.
[1]: https://public-inbox.org/git/CAPig+cSUy7rFwhmJ1SFHsAjPkoWparfY6wAjV=6kJyUL3SLQUw@mail.gmail.com/
Previous: samuel.maftoul@gmail.comNext: samuel.maftoul@gmail.com
Message 4 of 6 in “branch: support configuring --sort via .gitconfig”
  1. branch: support configuring --sort via .gitconfigsamuel.maftoul@gmail.com, Aug 15, 2018
  2. Eric SunshineAug 15, 2018
  3. branch: support configuring --sort via .gitconfigsamuel.maftoul@gmail.com, Aug 16, 2018
  4. Eric SunshineAug 16, 2018
  5. branch: support configuring --sort via .gitconfigsamuel.maftoul@gmail.com, Aug 16, 2018
  6. Junio C HamanoAug 16, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.