Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index a7e9322d2f122b1200d4541c6a7e5eb30c063e5e..d84897a67a3c365e280f88b36f43fc49e1ac9d7b 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -200,8 +200,8 @@ test_expect_success '--amend --edit of empty message' '
        test_cmp expect msg
 '
 
-test_expect_failure '--amend to set message to empty' '
-       echo batá >file &&
+test_expect_success '--amend to set message to empty' '
+       echo bata >file &&
        git add file &&
        git commit -m "unamended" &&
        git commit --amend --allow-empty-message -m "" &&
@@ -210,7 +210,7 @@ test_expect_failure '--amend to set message to empty' '
        test_cmp expect msg
 '
 
-test_expect_failure '--amend to set empty message needs --allow-empty-message' '
+test_expect_success '--amend to set empty message needs --allow-empty-message' '
        echo conga >file &&
        git add file &&
        git commit -m "unamended" &&
@@ -607,4 +607,24 @@ test_expect_success '--only works on to-be-born branch' '
        test_cmp expected actual
 '
 
+test_expect_success '--dry-run with conflicts fixed from a merge' '
+       # setup two branches with conflicting information
+       # in the same file, resolve the conflict,
+       # call commit with --dry-run
+       echo "Initial contents, unimportant" >test-file &&
+       git add test-file &&
+       git commit -m "Initial commit" &&
+       echo "commit-1-state" >test-file &&
+       git commit -m "commit 1" -i test-file &&
+       git tag commit-1 &&
+       git checkout -b branch-2 HEAD^1 &&
+       echo "commit-2-state" >test-file &&
+       git commit -m "commit 2" -i test-file &&
+       ! $(git merge --no-commit commit-1) &&
+       echo "commit-2-state" >test-file &&
+       git add test-file &&
+       git commit --dry-run &&
+       git commit -m "conflicts fixed from merge."
+'
+
 test_done