Merge branch 'maint'
* maint: git blame -C: fix output format tweaks when crossing file boundary.
This commit is contained in:
commit
2570458fda
@ -1435,14 +1435,14 @@ static void find_alignment(struct scoreboard *sb, int *option)
|
|||||||
struct commit_info ci;
|
struct commit_info ci;
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
|
|
||||||
suspect->commit->object.flags |= METAINFO_SHOWN;
|
|
||||||
get_commit_info(suspect->commit, &ci, 1);
|
|
||||||
if (strcmp(suspect->path, sb->path))
|
if (strcmp(suspect->path, sb->path))
|
||||||
*option |= OUTPUT_SHOW_NAME;
|
*option |= OUTPUT_SHOW_NAME;
|
||||||
num = strlen(suspect->path);
|
num = strlen(suspect->path);
|
||||||
if (longest_file < num)
|
if (longest_file < num)
|
||||||
longest_file = num;
|
longest_file = num;
|
||||||
|
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
|
||||||
|
suspect->commit->object.flags |= METAINFO_SHOWN;
|
||||||
|
get_commit_info(suspect->commit, &ci, 1);
|
||||||
num = strlen(ci.author);
|
num = strlen(ci.author);
|
||||||
if (longest_author < num)
|
if (longest_author < num)
|
||||||
longest_author = num;
|
longest_author = num;
|
||||||
|
Loading…
Reference in New Issue
Block a user