summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-26 14:13:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-26 14:13:43 (GMT)
commita1598010f775d82b5adf12c29d0f5bc9b41434c6 (patch)
treea93502da91e1eadbd491b62f12ed30beaf3ba402
parent590e5b88ece260559b3489321040e4bbbb0f878b (diff)
parent46c0eb58433c5bef578bdd8cf2f57631619e5b75 (diff)
downloadgit-a1598010f775d82b5adf12c29d0f5bc9b41434c6.zip
git-a1598010f775d82b5adf12c29d0f5bc9b41434c6.tar.gz
git-a1598010f775d82b5adf12c29d0f5bc9b41434c6.tar.bz2
Merge branch 'nd/per-worktree-ref-iteration'
Build fix. * nd/per-worktree-ref-iteration: files-backend.c: fix build error on Solaris
-rw-r--r--refs/files-backend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9183875..dd8abe9 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;