shallow: only add shallow graft points to new shallow file

pclouds · gitster · commit 6a3bbb4db409 · 2013-08-28T11:51:17.000-07:00
for_each_commit_graft() goes through all graft points, and shallow
boundaries are just one special kind of grafting.

If $GIT_DIR/shallow and $GIT_DIR/info/grafts are both present,
write_shallow_commits() may catch both sets, accidentally turning
some graft points to shallow boundaries.  Don't do that.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/shallow.c b/shallow.c
@@ -153,6 +153,8 @@ 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);
+	if (graft->nr_parent != -1)
+		return 0;
 	data->count++;
 	if (data->use_pack_protocol)
 		packet_buf_write(data->out, "shallow %s", hex);

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ static int write_one_shallow(const struct commit_graft graft, void cb_data)`
`153`	`153`	`{`
`154`	`154`	`struct write_shallow_data *data = cb_data;`
`155`	`155`	`const char *hex = sha1_to_hex(graft->sha1);`
	`156`	`+ if (graft->nr_parent != -1)`
	`157`	`+ return 0;`
`156`	`158`	`data->count++;`
`157`	`159`	`if (data->use_pack_protocol)`
`158`	`160`	`packet_buf_write(data->out, "shallow %s", hex);`