The behavior of git commit when doing a dry run changes if there are
unfixed/fixed merge conflits, but the test suite currently only asserts
that `git commit --dry-run` succeeds when all merge conflicts are fixed.
Add tests to document the behavior of all flags which imply a dry run
when (1) there is at least one unfixed merge conflict and (2) when all
merge conflicts are all fixed.
Signed-off-by: Samuel Lijin <sxli...@gmail.com>
---
t/t7501-commit.sh | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index fa61b1a4e..be087e73f 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -652,7 +652,8 @@ 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' '
+# set up env for tests of --dry-run given fixed/unfixed merge conflicts
+test_expect_success 'setup env with unfixed merge conflicts' '
# setup two branches with conflicting information
# in the same file, resolve the conflict,
# call commit with --dry-run
@@ -665,11 +666,45 @@ test_expect_success '--dry-run with conflicts fixed from
a merge' '
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 &&
+ test_expect_code 1 git merge --no-commit commit-1
+'
+
+test_expect_success '--dry-run with unfixed merge conflicts' '
+ test_expect_code 1 git commit --dry-run
+'
+
+test_expect_success '--short with unfixed merge conflicts' '
+ test_expect_code 1 git commit --short
+'
+
+test_expect_success '--porcelain with unfixed merge conflicts' '
+ test_expect_code 1 git commit --porcelain
+'
+
+test_expect_success '--long with unfixed merge conflicts' '
+ test_expect_code 1 git commit --long
+'
+
+test_expect_success '--dry-run with conflicts fixed from a merge' '
+ echo "merge-conflicts-fixed" >test-file &&
git add test-file &&
- git commit --dry-run &&
- git commit -m "conflicts fixed from merge."
+ git commit --dry-run
+'
+
+test_expect_failure '--short with conflicts fixed from a merge' '
+ git commit --short
+'
+
+test_expect_failure '--porcelain with conflicts fixed from a merge' '
+ git commit --porcelain
+'
+
+test_expect_success '--long with conflicts fixed from a merge' '
+ git commit --long
+'
+
+test_expect_success '--message with conflicts fixed from a merge' '
+ git commit --message "conflicts fixed from merge."
'
test_done
--
2.18.0
