diff options
Diffstat (limited to 't/t6001-rev-list-graft.sh')
-rwxr-xr-x | t/t6001-rev-list-graft.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh index 90d93f7..73a2465 100755 --- a/t/t6001-rev-list-graft.sh +++ b/t/t6001-rev-list-graft.sh @@ -23,7 +23,8 @@ test_expect_success setup ' git commit -a -m "Third in one history." && A2=$(git rev-parse --verify HEAD) && - rm -f .git/refs/heads/main .git/index && + git update-ref -d refs/heads/main && + rm -f .git/index && echo >fileA fileA again && echo >subdir/fileB fileB again && @@ -98,6 +99,7 @@ do " test_expect_success 'with grafts' " + mkdir -p .git/info && echo '$B0 $A2' >.git/info/grafts && check $type $B2 -- $B2 $B1 $B0 $A2 $A1 $A0 " @@ -116,10 +118,10 @@ done test_expect_success 'show advice that grafts are deprecated' ' git show HEAD 2>err && - test_i18ngrep "git replace" err && + test_grep "git replace" err && test_config advice.graftFileDeprecated false && git show HEAD 2>err && - test_i18ngrep ! "git replace" err + test_grep ! "git replace" err ' test_done |