From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Sep 2017 01:47:53 +0000 (+0900)
Subject: Merge branch 'nd/prune-in-worktree'
X-Git-Tag: v2.15.0-rc0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a044c7f1d56cef657be342e40de0795d688e882;p=thirdparty%2Fgit.git

Merge branch 'nd/prune-in-worktree'

"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.

* nd/prune-in-worktree:
  refs.c: reindent get_submodule_ref_store()
  refs.c: remove fallback-to-main-store code get_submodule_ref_store()
  rev-list: expose and document --single-worktree
  revision.c: --reflog add HEAD reflog from all worktrees
  files-backend: make reflog iterator go through per-worktree reflog
  revision.c: --all adds HEAD from all worktrees
  refs: remove dead for_each_*_submodule()
  refs.c: move for_each_remote_ref_submodule() to submodule.c
  revision.c: use refs_for_each*() instead of for_each_*_submodule()
  refs: add refs_head_ref()
  refs: move submodule slash stripping code to get_submodule_ref_store
  refs.c: refactor get_submodule_ref_store(), share common free block
  revision.c: --indexed-objects add objects from all worktrees
  revision.c: refactor add_index_objects_to_pending()
  refs.c: use is_dir_sep() in resolve_gitlink_ref()
  revision.h: new flag in struct rev_info wrt. worktree-related refs
---

8a044c7f1d56cef657be342e40de0795d688e882
diff --cc reachable.c
index d1ac5d97ef,492e87b9fa..88d7d679da
--- a/reachable.c
+++ b/reachable.c
@@@ -9,7 -9,7 +9,8 @@@
  #include "cache-tree.h"
  #include "progress.h"
  #include "list-objects.h"
 +#include "packfile.h"
+ #include "worktree.h"
  
  struct connectivity_progress {
  	struct progress *progress;
diff --cc revision.c
index 94a5e98525,6eba4131b4..f9a90d71d2
--- a/revision.c
+++ b/revision.c
@@@ -19,7 -19,7 +19,8 @@@
  #include "dir.h"
  #include "cache-tree.h"
  #include "bisect.h"
 +#include "packfile.h"
+ #include "worktree.h"
  
  volatile show_early_output_fn_t show_early_output;