зеркало из https://github.com/microsoft/git.git
apply --numstat: show new name, not old name.
Somehow --stat showed the new name but --numstat showed the old name for renamed/copied paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
de1d4fa2a1
Коммит
49e3343c9f
2
apply.c
2
apply.c
|
@ -1778,7 +1778,7 @@ static void numstat_patch_list(struct patch *patch)
|
|||
{
|
||||
for ( ; patch; patch = patch->next) {
|
||||
const char *name;
|
||||
name = patch->old_name ? patch->old_name : patch->new_name;
|
||||
name = patch->new_name ? patch->new_name : patch->old_name;
|
||||
printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
|
||||
if (line_termination && quote_c_style(name, NULL, NULL, 0))
|
||||
quote_c_style(name, NULL, stdout, 0);
|
||||
|
|
Загрузка…
Ссылка в новой задаче