diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:52 -0700 |
commit | cacab0c8566084901cd0f8ed6c9e1c4a5dc63677 (patch) | |
tree | 416f3e9c8881652ce29ae6bd03d6fa83a165e693 /t | |
parent | Merge branch 'jc/ident-whose-ident' (diff) | |
parent | revision: set rev_input_given in handle_revision_arg() (diff) | |
download | tgif-cacab0c8566084901cd0f8ed6c9e1c4a5dc63677.tar.xz |
Merge branch 'jk/rev-input-given-fix'
Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and
running "git log --ignore-missing $ZERO_OID" fell back to start
digging from HEAD; it has been corrected to become a no-op, like
"git log --tags=no-tag-matches-this-pattern" does.
* jk/rev-input-given-fix:
revision: set rev_input_given in handle_revision_arg()
Diffstat (limited to 't')
-rwxr-xr-x | t/t4202-log.sh | 10 | ||||
-rwxr-xr-x | t/t6018-rev-list-glob.sh | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index a0930599aa..56d34ed465 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1850,6 +1850,16 @@ test_expect_success 'log does not default to HEAD when rev input is given' ' test_must_be_empty actual ' +test_expect_success 'do not default to HEAD with ignored object on cmdline' ' + git log --ignore-missing $ZERO_OID >actual && + test_must_be_empty actual +' + +test_expect_success 'do not default to HEAD with ignored object on stdin' ' + echo $ZERO_OID | git log --ignore-missing --stdin >actual && + test_must_be_empty actual +' + test_expect_success 'set up --source tests' ' git checkout --orphan source-a && test_commit one && diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index bb5aeac07f..b31ff7eeec 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -345,6 +345,11 @@ test_expect_success 'rev-list should succeed with empty output with empty glob' test_must_be_empty actual ' +test_expect_success 'rev-list should succeed with empty output when ignoring missing' ' + git rev-list --ignore-missing $ZERO_OID >actual && + test_must_be_empty actual +' + test_expect_success 'shortlog accepts --glob/--tags/--remotes' ' compare shortlog "subspace/one subspace/two" --branches=subspace && |