projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.15.0
[platform/upstream/git.git]
/
builtin
/
blame.c
diff --git
a/builtin/blame.c
b/builtin/blame.c
index
bda1a78
..
67adaef
100644
(file)
--- a/
builtin/blame.c
+++ b/
builtin/blame.c
@@
-488,7
+488,7
@@
static int read_ancestry(const char *graft_file)
return -1;
while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
return -1;
while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
- struct commit_graft *graft = read_graft_line(
buf.buf, buf.len
);
+ struct commit_graft *graft = read_graft_line(
&buf
);
if (graft)
register_commit_graft(graft, 0);
}
if (graft)
register_commit_graft(graft, 0);
}
@@
-925,8
+925,7
@@
parse_done:
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
if (show_progress)
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
if (show_progress)
- pi.progress = start_progress_delay(_("Blaming lines"),
- sb.num_lines, 50, 1);
+ pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines);
assign_blame(&sb, opt);
assign_blame(&sb, opt);