diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-17 19:40:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-17 19:40:45 (GMT) |
| commit | f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7 (patch) | |
| tree | 91956e5a6a412502376f1d54009c9d23e213074a /t | |
| parent | f02dd06e26ed9f6f6f265791cfc7bfb48babf3b5 (diff) | |
| parent | 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (diff) | |
| download | git-f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7.zip git-f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7.tar.gz git-f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7.tar.bz2 | |
Merge branch 'maint'
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1010-mktree.sh | 10 | ||||
| -rwxr-xr-x | t/t4038-diff-combined.sh | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh index 9956e3a..b946f87 100755 --- a/t/t1010-mktree.sh +++ b/t/t1010-mktree.sh @@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' ' test_cmp tree.missing actual ' -test_expect_failure 'mktree reads ls-tree -r output (1)' ' - git mktree <all >actual && - test_cmp tree actual +test_expect_success 'mktree refuses to read ls-tree -r output (1)' ' + test_must_fail git mktree <all >actual ' -test_expect_failure 'mktree reads ls-tree -r output (2)' ' - git mktree <all.withsub >actual && - test_cmp tree.withsub actual +test_expect_success 'mktree refuses to read ls-tree -r output (2)' ' + test_must_fail git mktree <all.withsub >actual ' test_done diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 7584efa..40277c7 100755 --- a/t/t4038-diff-combined.sh +++ b/t/t4038-diff-combined.sh @@ -81,4 +81,12 @@ test_expect_success 'check combined output (2)' ' verify_helper sidesansone ' +test_expect_success 'diagnose truncated file' ' + >file && + git add file && + git commit --amend -C HEAD && + git show >out && + grep "diff --cc file" out +' + test_done |