Merge branch 'nd/worktree-list-fixup' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:09 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:09 +0000 (10:57 -0800)
commit1f46421a59c56743f6db30fee3b0cfc4451f4020
tree12582892ee3aeaefef76c6a28b1b86db49d2cf3e
parente9700f5b93ede6d09c5d43db72e967606205cc9c
parent4df1d4d4666eb26b420d5b386010470729846b8c
Merge branch 'nd/worktree-list-fixup' into next

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