From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2018 14:13:42 +0000 (+0900)
Subject: Merge branch 'nd/per-worktree-ref-iteration'
X-Git-Tag: v2.20.0-rc2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a1598010f775d82b5adf12c29d0f5bc9b41434c6?hp=590e5b88ece260559b3489321040e4bbbb0f878b

Merge branch 'nd/per-worktree-ref-iteration'

Build fix.

* nd/per-worktree-ref-iteration:
files-backend.c: fix build error on Solaris
---

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9183875dad..dd8abe9185 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -180,7 +180,8 @@ static void files_reflog_path(struct files_ref_store *refs,
 		break;
 	case REF_TYPE_OTHER_PSEUDOREF:
 	case REF_TYPE_MAIN_PSEUDOREF:
-		return files_reflog_path_other_worktrees(refs, sb, refname);
+		files_reflog_path_other_worktrees(refs, sb, refname);
+		break;
 	case REF_TYPE_NORMAL:
 		strbuf_addf(sb, "%s/logs/%s", refs->gitcommondir, refname);
 		break;