summaryrefslogtreecommitdiff
path: root/shallow.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-12-05 20:02:54 +0700
committerJunio C Hamano <gitster@pobox.com>2013-12-10 16:14:19 -0800
commiteab3296c7e5c99f559818357e70eeae09c24ac99 (patch)
treee8ded7e86858b5a28315e8b4d7687235f0e5e2d7 /shallow.c
parent0d7d285f0e29abb994fe32db87ee81b00f403bd2 (diff)
downloadgit-eab3296c7e5c99f559818357e70eeae09c24ac99.tar.gz
prune: clean .git/shallow after pruning objects
This patch teaches "prune" to remove shallow roots that are no longer reachable from any refs (e.g. when the relevant refs are removed). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shallow.c')
-rw-r--r--shallow.c55
1 files changed, 53 insertions, 2 deletions
diff --git a/shallow.c b/shallow.c
index 3c36dd82bc..c766fc3012 100644
--- a/shallow.c
+++ b/shallow.c
@@ -155,10 +155,14 @@ void check_shallow_file_for_update(void)
die("shallow file was changed during fetch");
}
+#define SEEN_ONLY 1
+#define VERBOSE 2
+
struct write_shallow_data {
struct strbuf *out;
int use_pack_protocol;
int count;
+ unsigned flags;
};
static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
@@ -167,6 +171,15 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
const char *hex = sha1_to_hex(graft->sha1);
if (graft->nr_parent != -1)
return 0;
+ if (data->flags & SEEN_ONLY) {
+ struct commit *c = lookup_commit(graft->sha1);
+ if (!c || !(c->object.flags & SEEN)) {
+ if (data->flags & VERBOSE)
+ printf("Removing %s from .git/shallow\n",
+ sha1_to_hex(c->object.sha1));
+ return 0;
+ }
+ }
data->count++;
if (data->use_pack_protocol)
packet_buf_write(data->out, "shallow %s", hex);
@@ -177,14 +190,16 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
return 0;
}
-int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
- const struct sha1_array *extra)
+static int write_shallow_commits_1(struct strbuf *out, int use_pack_protocol,
+ const struct sha1_array *extra,
+ unsigned flags)
{
struct write_shallow_data data;
int i;
data.out = out;
data.use_pack_protocol = use_pack_protocol;
data.count = 0;
+ data.flags = flags;
for_each_commit_graft(write_one_shallow, &data);
if (!extra)
return data.count;
@@ -196,6 +211,12 @@ int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
return data.count;
}
+int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
+ const struct sha1_array *extra)
+{
+ return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
+}
+
char *setup_temporary_shallow(const struct sha1_array *extra)
{
struct strbuf sb = STRBUF_INIT;
@@ -258,6 +279,36 @@ void advertise_shallow_grafts(int fd)
for_each_commit_graft(advertise_shallow_grafts_cb, &fd);
}
+/*
+ * mark_reachable_objects() should have been run prior to this and all
+ * reachable commits marked as "SEEN".
+ */
+void prune_shallow(int show_only)
+{
+ static struct lock_file shallow_lock;
+ struct strbuf sb = STRBUF_INIT;
+ int fd;
+
+ if (show_only) {
+ write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY | VERBOSE);
+ strbuf_release(&sb);
+ return;
+ }
+ check_shallow_file_for_update();
+ fd = hold_lock_file_for_update(&shallow_lock, git_path("shallow"),
+ LOCK_DIE_ON_ERROR);
+ if (write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY)) {
+ if (write_in_full(fd, sb.buf, sb.len) != sb.len)
+ die_errno("failed to write to %s",
+ shallow_lock.filename);
+ commit_lock_file(&shallow_lock);
+ } else {
+ unlink(git_path("shallow"));
+ rollback_lock_file(&shallow_lock);
+ }
+ strbuf_release(&sb);
+}
+
#define TRACE_KEY "GIT_TRACE_SHALLOW"
/*