diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-14 00:53:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-14 00:53:41 +0200 |
| commit | ecbd60ae9980cb3f30f54270f39b464c1f8b39a2 (patch) | |
| tree | 87bd9067e88b71bff198a10a53a47c9e4eb34770 /range-diff.c | |
| parent | Ninth batch (diff) | |
| parent | range-diff: show submodule changes irrespective of diff.submodule (diff) | |
| download | git-ecbd60ae9980cb3f30f54270f39b464c1f8b39a2.tar.xz git-ecbd60ae9980cb3f30f54270f39b464c1f8b39a2.zip | |
Merge branch 'pb/range-diff-with-submodule'
"git -c diff.submodule=log range-diff" did not show anything for
submodules that changed in the ranges being compared, and
"git -c diff.submodule=diff range-diff" did not work correctly.
Fix this by including the "--submodule=short" output
unconditionally to be compared.
* pb/range-diff-with-submodule:
range-diff: show submodule changes irrespective of diff.submodule
Diffstat (limited to 'range-diff.c')
| -rw-r--r-- | range-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/range-diff.c b/range-diff.c index 39cc010c62..f63b3ffc20 100644 --- a/range-diff.c +++ b/range-diff.c @@ -44,7 +44,7 @@ static int read_patches(const char *range, struct string_list *list, strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges", "--reverse", "--date-order", "--decorate=no", - "--no-prefix", + "--no-prefix", "--submodule=short", /* * Choose indicators that are not used anywhere * else in diffs, but still look reasonable |