mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/decorate-grafts'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2011-08-28 21:22:58 -07:00
parent 2730f55527 b9ad500262
commit 3400c222d9
4 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
commit.c
View File

@ -214,22 +214,12 @@ struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
return commit_graft[pos];
}
int write_shallow_commits(struct strbuf *out, int use_pack_protocol)
int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
{
int i, count = 0;
for (i = 0; i < commit_graft_nr; i++)
if (commit_graft[i]->nr_parent < 0) {
const char *hex =
sha1_to_hex(commit_graft[i]->sha1);
count++;
if (use_pack_protocol)
packet_buf_write(out, "shallow %s", hex);
else {
strbuf_addstr(out, hex);
strbuf_addch(out, '\n');
}
}
return count;
int i, ret;
for (i = ret = 0; i < commit_graft_nr && !ret; i++)
ret = fn(commit_graft[i], cb_data);
return ret;
}
int unregister_shallow(const unsigned char *sha1)