global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  git-annotate: fix -S on graft file with comments.
  git-annotate: no need to exec blame; it is built-in now.
This commit is contained in:
Junio C Hamano
2006-11-10 13:50:36 -08:00
parent dff977c1c5 8eaf79869f
commit 4caaf24b6a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-annotate.c
View File

@@ -4,7 +4,7 @@
* Copyright (C) 2006 Ryan Anderson
*/
#include "git-compat-util.h"
#include "exec_cmd.h"
#include "builtin.h"
int cmd_annotate(int argc, const char **argv, const char *prefix)
{
@@ -20,6 +20,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
}
nargv[argc + 1] = NULL;
return execv_git_cmd(nargv);
return cmd_blame(argc + 1, nargv, prefix);
}

3
builtin-blame.c
View File

@@ -1407,7 +1407,8 @@ static int read_ancestry(const char *graft_file)
/* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len);
register_commit_graft(graft, 0);
if (graft)
register_commit_graft(graft, 0);
}
fclose(fp);
return 0;