仅显示目录的git diff,而不是所有新文件

4
如果我有一个存储库,在其中添加新的子目录并更改文件,当我运行git status时,我会看到一个摘要。
$ git status
On branch test
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   composer.json
        modified:   composer.lock
        modified:   vendor/composer/autoload_psr4.php
        modified:   vendor/composer/autoload_static.php
        modified:   vendor/composer/installed.json

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        modules/contrib/a11y_paragraphs_tabs/
        vendor/jakubsuchy/

no changes added to commit (use "git add" and/or "git commit -a")

当我添加并提交这些文件后,然后运行git diff --stat master命令,它会显示所有文件名,包括那些在新目录中的文件:
$ git diff --stat master
 composer.json                                                                                             |   5 +-
 composer.lock                                                                                             | 207 ++++++++++++++++++++++++++++++++-
 modules/contrib/a11y_paragraphs_tabs/LICENSE.txt                                                          | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 modules/contrib/a11y_paragraphs_tabs/README.md                                                            |  88 ++++++++++++++
 modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.info.yml                                        |  14 +++
 modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.install                                         |  33 ++++++
 modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.libraries.yml                                   |  17 +++
 modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.module                                          |  46 ++++++++
 .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tab_content.default.yml            |  25 ++++
 .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tabs_panel.default.yml             |  39 +++++++
 .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tabs_wrapper.default.yml           |  39 +++++++
 .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tab_content.default.yml            |  21 ++++
 .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tabs_panel.default.yml             |  32 ++++++
 .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tabs_wrapper.default.yml           |  32 ++++++
 .../config/optional/field.field.paragraph.a11y_paragraphs_tab_content.field_a11y_para_tabs_text_area.yml  |  20 ++++
 .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_panel.field_a11y_para_tabs_tab_content.yml |  36 ++++++
 .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_panel.field_a11y_para_tabs_tab_title.yml   |  20 ++++
 .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_wrapper.field_a11y_para_tabs_sec_title.yml |  20 ++++
 .../optional/field.field.paragraph.a11y_paragraphs_tabs_wrapper.field_a11y_para_tabs_tabs_panel.yml       |  33 ++++++
 .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_sec_title.yml       |  19 +++
 .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tab_content.yml     |  19 +++
 .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tab_title.yml       |  19 +++
 .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tabs_panel.yml      |  19 +++
 .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_text_area.yml       |  18 +++
 .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tab_content.yml       |   8 ++
 .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tabs_panel.yml        |   8 ++
 .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tabs_wrapper.yml      |   8 ++
 modules/contrib/a11y_paragraphs_tabs/css/a11y-paragraphs-tabs.css                                         | 162 ++++++++++++++++++++++++++
 modules/contrib/a11y_paragraphs_tabs/js/a11y-paragraphs-tabs.js                                           |   6 +
 modules/contrib/a11y_paragraphs_tabs/templates/field--field-a11y-para-tabs-tabs-panel.html.twig           |   3 +
 modules/contrib/a11y_paragraphs_tabs/templates/paragraph--a11y-paragraphs-tabs-wrapper.html.twig          | 131 +++++++++++++++++++++

这段文本是文件路径的列表,其中包含了文件名和一些数字。它们可能代表了文件的大小或其他属性。以下是其中英翻译:
- mules/contrib/nasa:Mules贡献的NASA文件夹 - vendor/composer/autoload_psr4.php:供应商/作曲家/自动加载PSR-4 PHP文件 - vendor/composer/autoload_static.php:供应商/作曲家/自动加载静态PHP文件 - vendor/composer/installed.json:供应商/作曲家/已安装的JSON文件,包含195个条目
 37 files changed, 1683 insertions(+), 7 deletions(-)

有没有办法对另一个分支执行diff --stat,并且输出看起来与git status命令的输出相似?换句话说,我希望看到这样的结果:
$ git diff --stat --summary? master
 composer.json                                         |   5 +-
 composer.lock                                         | 207 ++++++++++++++++++++++++++++++++-
 modules/contrib/a11y_paragraphs_tabs/                 |   some other stat here indicating files
 vendor/composer/autoload_psr4.php                     |   1 +
 vendor/composer/autoload_static.php                   |   5 +
 vendor/composer/installed.json                        | 195 +++++++++++++++++++++++++++++++
 37 files changed, 1683 insertions(+), 7 deletions(-)

如果另一个分支中没有包含该目录,则只列出该目录,而不列出其中所有文件和子目录。
1个回答

3
您可能需要组合以下内容:
  • 对于当前文件夹,使用git diff --stat --summary .(请注意<空格 点>
  • 对于其他文件夹,请使用git diff --dirstat
我没有看到一种将两者组合在一个命令中的方法。

网页内容由stack overflow 提供, 点击上面的
可以查看英文原文,
原文链接