git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-29 13:48:07 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'jc/gitpm' into next

Browse Source 
* jc/gitpm:
  Revert "Make it possible to set up libgit directly (instead of from the environment)"
  Revert "Git.pm: Introduce fast get_object() method"
  Revert "Convert git-annotate to use Git.pm"
This commit is contained in:
Junio C Hamano
2006-09-02 23:02:44 -07:00
parent e886216c72 81a71734bb
commit 9ce3e35aa6
8 changed files with 175 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
commit.c
View File

@@ -163,14 +163,6 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups)
return 0;
}
void free_commit_grafts(void)
{
int pos = commit_graft_nr;
while (pos >= 0)
free(commit_graft[pos--]);
commit_graft_nr = 0;
}
struct commit_graft *read_graft_line(char *buf, int len)
{
/* The format is just "Commit Parent1 Parent2 ...\n" */
@@ -223,18 +215,11 @@ int read_graft_file(const char *graft_file)
static void prepare_commit_graft(void)
{
static int commit_graft_prepared;
static char *last_graft_file;
char *graft_file = get_graft_file();
if (last_graft_file) {
if (!strcmp(graft_file, last_graft_file))
return;
free_commit_grafts();
}
if (last_graft_file)
free(last_graft_file);
last_graft_file = strdup(graft_file);
char *graft_file;
if (commit_graft_prepared)
return;
graft_file = get_graft_file();
read_graft_file(graft_file);
commit_graft_prepared = 1;
}