diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
| commit | b52ac60bc461a16076209a3027bb15f7c890f148 (patch) | |
| tree | f16de68f0513127fff42a457a9ff56a3f0f37132 /t | |
| parent | d0975a0724cc8f0f88931264b8b97c8a4c428dda (diff) | |
| parent | 669b1d2aaec73ba762bf566078308075886ca208 (diff) | |
Merge branch 'md/exclude-promisor-objects-fix' into maint
Operations on promisor objects make sense in the context of only a
small subset of the commands that internally use the revisions
machinery, but the "--exclude-promisor-objects" option were taken
and led to nonsense results by commands like "log", to which it
didn't make much sense. This has been corrected.
* md/exclude-promisor-objects-fix:
exclude-promisor-objects: declare when option is allowed
Documentation/git-log.txt: do not show --exclude-promisor-objects
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 4 | ||||
| -rwxr-xr-x | t/t8002-blame.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 153a506151..819c24d10e 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1703,4 +1703,8 @@ test_expect_success 'log --source paints symmetric ranges' ' test_cmp expect actual ' +test_expect_success '--exclude-promisor-objects does not BUG-crash' ' + test_must_fail git log --exclude-promisor-objects source-a +' + test_done diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh index 380e1c1054..eea048e52c 100755 --- a/t/t8002-blame.sh +++ b/t/t8002-blame.sh @@ -118,4 +118,8 @@ test_expect_success '--no-abbrev works like --abbrev=40' ' check_abbrev 40 --no-abbrev ' +test_expect_success '--exclude-promisor-objects does not BUG-crash' ' + test_must_fail git blame --exclude-promisor-objects one +' + test_done |