From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Dec 2016 23:27:48 +0000 (-0800)
Subject: Merge branch 'nd/worktree-list-fixup'
X-Git-Tag: v2.12.0-rc0~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cf8c9053afbb666dc30f384d313e3e85e00d53a;p=thirdparty%2Fgit.git

Merge branch 'nd/worktree-list-fixup'

The output from "git worktree list" was made in readdir() order,
and was unstable.

* nd/worktree-list-fixup:
  worktree list: keep the list sorted
  worktree.c: get_worktrees() takes a new flag argument
  get_worktrees() must return main worktree as first item even on error
  worktree: reorder an if statement
  worktree.c: zero new 'struct worktree' on allocation
---

2cf8c9053afbb666dc30f384d313e3e85e00d53a