Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
blame: move show_root flag to scoreboard
author
Jeff Smith
<whydoubt@gmail.com>
Wed, 24 May 2017 05:15:22 +0000
(
00:15
-0500)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 24 May 2017 06:41:51 +0000
(15:41 +0900)
The show_root flag is used in parts of blame that are being moved to
libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/blame.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f81d70e
)
diff --git
a/builtin/blame.c
b/builtin/blame.c
index 161d15c173fb50276391636d7d867147b6a93465..fdd41b41be019161f798bb676aeadd89ec10b23a 100644
(file)
--- a/
builtin/blame.c
+++ b/
builtin/blame.c
@@
-384,6
+384,7
@@
struct blame_scoreboard {
/* flags */
int reverse;
/* flags */
int reverse;
+ int show_root;
};
static void sanity_check_refcnt(struct blame_scoreboard *);
};
static void sanity_check_refcnt(struct blame_scoreboard *);
@@
-1784,7
+1785,7
@@
static void assign_blame(struct blame_scoreboard *sb, int opt)
mark_parents_uninteresting(commit);
}
/* treat root commit as boundary */
mark_parents_uninteresting(commit);
}
/* treat root commit as boundary */
- if (!commit->parents && !show_root)
+ if (!commit->parents && !s
b->s
how_root)
commit->object.flags |= UNINTERESTING;
/* Take responsibility for the remaining entries */
commit->object.flags |= UNINTERESTING;
/* Take responsibility for the remaining entries */
@@
-2885,6
+2886,8
@@
int cmd_blame(int argc, const char **argv, const char *prefix)
if (blame_copy_score)
sb.copy_score = blame_copy_score;
if (blame_copy_score)
sb.copy_score = blame_copy_score;
+ sb.show_root = show_root;
+
read_mailmap(&mailmap, NULL);
assign_blame(&sb, opt);
read_mailmap(&mailmap, NULL);
assign_blame(&sb, opt);