diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-06 21:50:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-06 21:50:46 (GMT) |
| commit | 3f3f8d9d09cdb6810e848d82583749e6080d2167 (patch) | |
| tree | 5f85fe29add68b68d375c0c74f0791f811f4692c /t | |
| parent | f9bdf9b2102bd848c7a3eabff2ba5af63828de54 (diff) | |
| parent | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 (diff) | |
| download | git-3f3f8d9d09cdb6810e848d82583749e6080d2167.zip git-3f3f8d9d09cdb6810e848d82583749e6080d2167.tar.gz git-3f3f8d9d09cdb6810e848d82583749e6080d2167.tar.bz2 | |
Merge branch 'jc/conflict-marker-size'
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4017-diff-retval.sh | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index 0391a58..6158985 100755 --- a/t/t4017-diff-retval.sh +++ b/t/t4017-diff-retval.sh @@ -120,7 +120,6 @@ test_expect_success '--check with --no-pager returns 2 for dirty difference' ' ' - test_expect_success 'check should test not just the last line' ' echo "" >>a && git --no-pager diff --check @@ -142,4 +141,26 @@ test_expect_success 'check detects leftover conflict markers' ' git reset --hard ' +test_expect_success 'check honors conflict marker length' ' + git reset --hard && + echo ">>>>>>> boo" >>b && + echo "======" >>a && + git diff --check a && + ( + git diff --check b + test $? = 2 + ) && + git reset --hard && + echo ">>>>>>>> boo" >>b && + echo "========" >>a && + git diff --check && + echo "b conflict-marker-size=8" >.gitattributes && + ( + git diff --check b + test $? = 2 + ) && + git diff --check a && + git reset --hard +' + test_done |