diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-24 08:44:49 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-27 08:45:47 -0700 |
commit | b8d5cf4f96f6e57ddc91dfcc530e47c878aff598 (patch) | |
tree | e34a35835213b7e7e846dea029081e7c02519510 /t/t1501-work-tree.sh | |
parent | c033cc15087da35edf2c4d634d664a73eed6c5e8 (diff) | |
download | git-b8d5cf4f96f6e57ddc91dfcc530e47c878aff598.tar.gz |
t/helper: merge test-path-utils into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1501-work-tree.sh')
-rwxr-xr-x | t/t1501-work-tree.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1501-work-tree.sh b/t/t1501-work-tree.sh index b06210ec5e..b07cb9140e 100755 --- a/t/t1501-work-tree.sh +++ b/t/t1501-work-tree.sh @@ -360,7 +360,7 @@ test_expect_success 'GIT_DIR set (1)' ' ( cd work && GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && - test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual ) ' @@ -371,7 +371,7 @@ test_expect_success 'GIT_DIR set (2)' ' ( cd work && GIT_DIR=../gitfile git rev-parse --git-common-dir >actual && - test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual ) ' @@ -382,7 +382,7 @@ test_expect_success 'Auto discovery' ' ( cd work && git rev-parse --git-common-dir >actual && - test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual && echo haha >data1 && git add data1 && @@ -400,7 +400,7 @@ test_expect_success '$GIT_DIR/common overrides core.worktree' ' ( cd work && git rev-parse --git-common-dir >actual && - test-path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && + test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect && test_cmp expect actual && echo haha >data2 && git add data2 && |