From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Johannes Sixt" <j6t@kdbg.org>, "Jeff King" <peff@peff.net>,
mhagger@alum.mit.edu, dturner@twopensource.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 4/4] reachable.c: make reachable reflogs for all per-worktree reflogs
Date: Wed, 1 Jun 2016 17:45:19 +0700 [thread overview]
Message-ID: <20160601104519.16563-5-pclouds@gmail.com> (raw)
In-Reply-To: <20160601104519.16563-1-pclouds@gmail.com>
Same reason as the previous commit, this is to avoid deleting objects
being referenced by per-worktree reflogs from other worktrees.
"logs/HEAD" is most important. "logs/refs/bisect" should not live long
enough to matter, but let's add it too for safety.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
reachable.c | 7 ++++---
revision.c | 19 +++++++++++++++++++
revision.h | 3 +++
t/t5304-prune.sh | 19 +++++++++++++++++++
4 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/reachable.c b/reachable.c
index e5f9170..73915e0 100644
--- a/reachable.c
+++ b/reachable.c
@@ -156,7 +156,7 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
FOR_EACH_OBJECT_LOCAL_ONLY);
}
-static void add_objects_from_worktree(struct rev_info *revs)
+static void add_objects_from_worktree(struct rev_info *revs, int mark_reflog)
{
struct worktree **worktrees, **p;
@@ -176,7 +176,8 @@ static void add_objects_from_worktree(struct rev_info *revs)
o = parse_object_or_die(wt->head_sha1, "HEAD");
add_pending_object(revs, o, "");
}
-
+ if (mark_reflog)
+ add_worktree_reflogs_to_pending(revs, 0, wt);
}
free_worktrees(worktrees);
@@ -214,7 +215,7 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
* Add all objects from the in-core index file and detached
* HEAD which is not included in the list above
*/
- add_objects_from_worktree(revs);
+ add_objects_from_worktree(revs, mark_reflog);
cp.progress = progress;
cp.count = 0;
diff --git a/revision.c b/revision.c
index bbb6ff1..6a197a4 100644
--- a/revision.c
+++ b/revision.c
@@ -19,6 +19,7 @@
#include "dir.h"
#include "cache-tree.h"
#include "bisect.h"
+#include "worktree.h"
volatile show_early_output_fn_t show_early_output;
@@ -1245,6 +1246,24 @@ static int handle_one_reflog(const char *path, const struct object_id *oid,
return 0;
}
+void add_worktree_reflogs_to_pending(struct rev_info *revs, unsigned flags,
+ struct worktree *wt)
+{
+ struct all_refs_cb cb;
+ char *path;
+
+ cb.all_revs = revs;
+ cb.all_flags = flags;
+ path = xstrdup(worktree_git_path(wt, "logs/HEAD"));
+ if (file_exists(path))
+ handle_one_reflog(path, NULL, 0, &cb);
+ free(path);
+ path = xstrdup(worktree_git_path(wt, "logs/refs/bisect"));
+ if (file_exists(path))
+ handle_one_reflog(path, NULL, 0, &cb);
+ free(path);
+}
+
void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
{
struct all_refs_cb cb;
diff --git a/revision.h b/revision.h
index d06d098..9f3f148 100644
--- a/revision.h
+++ b/revision.h
@@ -30,6 +30,7 @@ struct log_info;
struct string_list;
struct saved_parents;
struct index_state;
+struct worktree;
struct rev_cmdline_info {
unsigned int nr;
@@ -272,6 +273,8 @@ extern void add_pending_sha1(struct rev_info *revs,
extern void add_head_to_pending(struct rev_info *);
extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
+extern void add_worktree_reflogs_to_pending(struct rev_info *, unsigned int flags,
+ struct worktree *);
extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags,
const struct index_state *);
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 683bdb0..6b1c456 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -304,4 +304,23 @@ test_expect_success 'prune: handle HEAD in multiple worktrees' '
test_cmp third-worktree/blob actual
'
+test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
+ (
+ cd third-worktree &&
+ git config core.logAllRefUpdates true &&
+ echo "HEAD{1} blob for third-worktree" >blob &&
+ git add blob &&
+ git commit -m "second commit in third" &&
+ cp blob expected &&
+ echo "HEAD{0} blob for third-worktree" >blob &&
+ git add blob &&
+ git commit -m "third commit in third" &&
+ git show HEAD@{1}:blob >actual &&
+ test_cmp expected actual
+ ) &&
+ git prune --expire=now &&
+ git -C third-worktree show HEAD@{1}:blob >actual &&
+ test_cmp third-worktree/expected actual
+'
+
test_done
--
2.8.2.524.g6ff3d78
next prev parent reply other threads:[~2016-06-01 10:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 7:07 git gc and worktrees Johannes Sixt
2016-05-31 12:02 ` Duy Nguyen
2016-05-31 22:14 ` Jeff King
2016-06-01 7:00 ` Johannes Sixt
2016-06-01 8:57 ` Michael Haggerty
2016-06-01 15:15 ` Junio C Hamano
2016-06-01 16:12 ` Michael Haggerty
2016-06-01 19:39 ` Junio C Hamano
2016-06-02 4:08 ` Michael Haggerty
2016-06-03 16:45 ` Junio C Hamano
2016-06-01 10:45 ` [PATCH 0/4] Fix prune/gc problem with multiple worktrees Nguyễn Thái Ngọc Duy
2016-06-01 10:45 ` [PATCH 1/4] revision.c: move read_cache() out of add_index_objects_to_pending() Nguyễn Thái Ngọc Duy
2016-06-01 10:45 ` [PATCH 2/4] reachable.c: mark reachable objects in index from all worktrees Nguyễn Thái Ngọc Duy
2016-06-01 18:13 ` Eric Sunshine
2016-06-02 9:35 ` Duy Nguyen
2016-06-01 18:57 ` David Turner
2016-06-02 9:37 ` Duy Nguyen
2016-06-01 10:45 ` [PATCH 3/4] reachable.c: mark reachable detached HEAD " Nguyễn Thái Ngọc Duy
2016-06-01 10:45 ` Nguyễn Thái Ngọc Duy [this message]
2016-06-01 15:51 ` [PATCH 4/4] reachable.c: make reachable reflogs for all per-worktree reflogs Michael Haggerty
2016-06-01 16:01 ` [PATCH 0/4] Fix prune/gc problem with multiple worktrees Jeff King
2016-06-01 16:06 ` Junio C Hamano
2016-06-02 9:53 ` Duy Nguyen
2016-06-02 11:26 ` Michael Haggerty
2016-06-02 17:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160601104519.16563-5-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).