diff options
| -rw-r--r-- | builtin/log.c | 1 | ||||
| -rwxr-xr-x | t/t4014-format-patch.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 14fdf39165..9ee2bd1fd8 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1741,6 +1741,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (base_commit || base_auto) { struct commit *base = get_base_commit(base_commit, list, nr); reset_revision_walk(); + clear_object_flags(UNINTERESTING); prepare_bases(&bases, base, list, nr); } diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 482112ca33..b67d5729df 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1551,13 +1551,15 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' ' test_expect_success 'format-patch --base' ' git checkout side && - git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual && + git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 && + git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 && echo >expected && echo "base-commit: $(git rev-parse HEAD~3)" >>expected && echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected && echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected && signature >> expected && - test_cmp expected actual + test_cmp expected actual1 && + test_cmp expected actual2 ' test_expect_success 'format-patch --base errors out when base commit is in revision list' ' |