diff options
Diffstat (limited to 't')
-rwxr-xr-x | t/t1301-shared-repo.sh | 3 | ||||
-rwxr-xr-x | t/t4018-diff-funcname.sh | 9 | ||||
-rwxr-xr-x | t/t7600-merge.sh | 24 |
3 files changed, 35 insertions, 1 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index dc85e8b60a..2275caa317 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -7,6 +7,9 @@ test_description='Test shared repository initialization' . ./test-lib.sh +# Remove a default ACL from the test dir if possible. +setfacl -k . 2>/dev/null + # User must have read permissions to the repo -> failure on --shared=0400 test_expect_success 'shared = 0400 (faulty permission u-w)' ' mkdir sub && ( diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 0320e19770..be541348c6 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -65,7 +65,14 @@ test_expect_success 'custom pattern' ' test_expect_success 'last regexp must not be negated' ' git config diff.java.funcname "!static" && - test_must_fail git diff --no-index Beer.java Beer-correct.java + git diff --no-index Beer.java Beer-correct.java 2>&1 | + grep "fatal: Last expression must not be negated:" +' + +test_expect_success 'pattern which matches to end of line' ' + git config diff.java.funcname "Beer$" && + git diff --no-index Beer.java Beer-correct.java | + grep "^@@.*@@ Beer" ' test_expect_success 'alternation in pattern' ' diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 7313ac278c..3a36a95b9a 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -518,6 +518,30 @@ test_expect_success 'refresh the index before merging' ' git merge c3 ' +cat >expected <<EOF +Merge branch 'c5' (early part) +EOF + +test_expect_success 'merge early part of c2' ' + git reset --hard c3 && + echo c4 > c4.c && + git add c4.c && + git commit -m c4 && + git tag c4 && + echo c5 > c5.c && + git add c5.c && + git commit -m c5 && + git tag c5 && + git reset --hard c3 && + echo c6 > c6.c && + git add c6.c && + git commit -m c6 && + git tag c6 && + git merge c5~1 && + git show -s --pretty=format:%s HEAD > actual && + test_cmp actual expected +' + test_debug 'gitk --all' test_done |