| commit | 305ddd444ee66607581c014b371ed74af534eca5 | |
| author | Johan Herland <johan@herland.net> | |
| Tue, 9 Nov 2010 21:49:56 +0000 (9 22:49 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:23:55 +0000 (17 13:23 -0800) | ||
| tree | 08c6496482d895f43984adfb6b2bc20af9f90ef9 | treesnapshot (tar.gz zip) |
| parent | a6a09095a08339afc8468d053ff978ed4662a1d5 | commitdiff |
git notes merge: Add testcases for merging notes trees at different fanouts
Notes trees may exist at different fanout levels internally. This
implementation detail should not be visible to the user, and it should
certainly not affect the merging of notes tree.
This patch adds testcases verifying the correctness of 'git notes merge'
when merging notes trees at different fanout levels.
This patch has been improved by the following contributions:
- Junio C Hamano: Portability: Don't string-compare 'wc -l' output
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Notes trees may exist at different fanout levels internally. This
implementation detail should not be visible to the user, and it should
certainly not affect the merging of notes tree.
This patch adds testcases verifying the correctness of 'git notes merge'
when merging notes trees at different fanout levels.
This patch has been improved by the following contributions:
- Junio C Hamano: Portability: Don't string-compare 'wc -l' output
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3311-notes-merge-fanout.sh | [new file with mode: 0755] | blob |