From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:27 +0000 (-0800)
Subject: Merge branch 'nd/worktree-list-fixup' into maint
X-Git-Tag: v2.11.1~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/430fd1cae522d1eff58478eb606bee996b52208f?hp=--cc

Merge branch 'nd/worktree-list-fixup' into maint

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
---

430fd1cae522d1eff58478eb606bee996b52208f