diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-13 13:35:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-13 13:35:25 -0700 |
| commit | 2ee13a780b1464039b89b9987b1cdd74d9e40780 (patch) | |
| tree | 614cf75d25abc4a7ea08e50b211a8f5365032b8b /t | |
| parent | 7d4bebfe93b5ef0eb81b8a7b0f6edf365104ed01 (diff) | |
| parent | f74bbc8dd2637498bc07132ae6bfa6d1b88dafb0 (diff) | |
| download | git-2ee13a780b1464039b89b9987b1cdd74d9e40780.tar.gz | |
Merge branch 'jk/cached-commit-buffer' into HEAD
* jk/cached-commit-buffer:
revision: drop --show-all option
commit: drop uses of get_cached_commit_buffer()
Git 2.16.2
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6015-rev-list-show-all-parents.sh | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/t/t6015-rev-list-show-all-parents.sh b/t/t6015-rev-list-show-all-parents.sh deleted file mode 100755 index 3c73c93ba6..0000000000 --- a/t/t6015-rev-list-show-all-parents.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -test_description='--show-all --parents does not rewrite TREESAME commits' - -. ./test-lib.sh - -test_expect_success 'set up --show-all --parents test' ' - test_commit one foo.txt && - commit1=$(git rev-list -1 HEAD) && - test_commit two bar.txt && - commit2=$(git rev-list -1 HEAD) && - test_commit three foo.txt && - commit3=$(git rev-list -1 HEAD) - ' - -test_expect_success '--parents rewrites TREESAME parents correctly' ' - echo $commit3 $commit1 > expected && - echo $commit1 >> expected && - git rev-list --parents HEAD -- foo.txt > actual && - test_cmp expected actual - ' - -test_expect_success '--parents --show-all does not rewrites TREESAME parents' ' - echo $commit3 $commit2 > expected && - echo $commit2 $commit1 >> expected && - echo $commit1 >> expected && - git rev-list --parents --show-all HEAD -- foo.txt > actual && - test_cmp expected actual - ' - -test_done |