summaryrefslogtreecommitdiff
path: root/builtin/fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-29 04:22:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-29 04:22:58 (GMT)
commit3400c222d9a2dfe8a63684fd47ad5ee7f5d6c4c4 (patch)
treef041c784ac07013cbf8783800ad046bf5da7efe9 /builtin/fetch-pack.c
parent2730f55527143d3476c159cebbdb63d5e6a5c2a8 (diff)
parentb9ad500262843c6110968da1f4e7b6717bc71303 (diff)
downloadgit-3400c222d9a2dfe8a63684fd47ad5ee7f5d6c4c4.zip
git-3400c222d9a2dfe8a63684fd47ad5ee7f5d6c4c4.tar.gz
git-3400c222d9a2dfe8a63684fd47ad5ee7f5d6c4c4.tar.bz2
Merge branch 'nd/decorate-grafts'
* nd/decorate-grafts: log: Do not decorate replacements with --no-replace-objects log: decorate "replaced" on to replaced commits log: decorate grafted commits with "grafted" Move write_shallow_commits to fetch-pack.c Add for_each_commit_graft() to iterate all grafts decoration: do not mis-decorate refs with same prefix
Diffstat (limited to 'builtin/fetch-pack.c')
-rw-r--r--builtin/fetch-pack.c30
1 files changed, 30 insertions, 0 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 3c871c2..412bd32 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -185,6 +185,36 @@ static void consume_shallow_list(int fd)
}
}
+struct write_shallow_data {
+ struct strbuf *out;
+ int use_pack_protocol;
+ int count;
+};
+
+static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
+{
+ struct write_shallow_data *data = cb_data;
+ const char *hex = sha1_to_hex(graft->sha1);
+ data->count++;
+ if (data->use_pack_protocol)
+ packet_buf_write(data->out, "shallow %s", hex);
+ else {
+ strbuf_addstr(data->out, hex);
+ strbuf_addch(data->out, '\n');
+ }
+ return 0;
+}
+
+static int write_shallow_commits(struct strbuf *out, int use_pack_protocol)
+{
+ struct write_shallow_data data;
+ data.out = out;
+ data.use_pack_protocol = use_pack_protocol;
+ data.count = 0;
+ for_each_commit_graft(write_one_shallow, &data);
+ return data.count;
+}
+
static enum ack_type get_ack(int fd, unsigned char *result_sha1)
{
static char line[1000];