diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-02-05 21:39:49 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-05 13:54:30 -0800 |
| commit | edbc00e76d29213010db947d8d7bff3baab12a35 (patch) | |
| tree | 1a5ac3c8af337373398e0ccd62c1398726b9c94c /t/t4038-diff-combined.sh | |
| parent | combine-diff: lift 32-way limit of combined diff (diff) | |
| download | tgif-edbc00e76d29213010db947d8d7bff3baab12a35.tar.xz | |
t4038: add tests for "diff --cc --raw <trees>"
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4038-diff-combined.sh')
| -rwxr-xr-x | t/t4038-diff-combined.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 40277c77aa..614425adac 100755 --- a/t/t4038-diff-combined.sh +++ b/t/t4038-diff-combined.sh @@ -89,4 +89,28 @@ test_expect_success 'diagnose truncated file' ' grep "diff --cc file" out ' +test_expect_success 'setup for --cc --raw' ' + blob=$(echo file | git hash-object --stdin -w) && + base_tree=$(echo "100644 blob $blob file" | git mktree) && + trees= && + for i in `test_seq 1 40` + do + blob=$(echo file$i | git hash-object --stdin -w) && + trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF" + done +' + +test_expect_success 'check --cc --raw with four trees' ' + four_trees=$(echo "$trees" | sed -e 4q) && + git diff --cc --raw $four_trees $base_tree >out && + # Check for four leading colons in the output: + grep "^::::[^:]" out +' + +test_expect_success 'check --cc --raw with forty trees' ' + git diff --cc --raw $trees $base_tree >out && + # Check for forty leading colons in the output: + grep "^::::::::::::::::::::::::::::::::::::::::[^:]" out +' + test_done |