diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
| commit | 6c6f87842bcb8ac4d36922cec5b5ce25de14756e (patch) | |
| tree | a846522ebad998f36a8d5a27a7301fc72825efc9 /t/t0021-conversion.sh | |
| parent | 8642abc76454a6e09344e27a7797ff08264abe76 (diff) | |
| parent | 07814d90095b65b4594efd47c69f9f171ef162d4 (diff) | |
| download | git-6c6f87842bcb8ac4d36922cec5b5ce25de14756e.tar.gz | |
Merge branch 'hg/id-munging'
* hg/id-munging:
convert: Keep foreign $Id$ on checkout.
convert: Safer handling of $Id$ contraction.
Diffstat (limited to 't/t0021-conversion.sh')
| -rwxr-xr-x | t/t0021-conversion.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 6cb8d60ea2..828e35baf7 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -65,17 +65,21 @@ test_expect_success expanded_in_repo ' echo "\$Id:NoSpaceAtFront \$" echo "\$Id:NoSpaceAtEitherEnd\$" echo "\$Id: NoTerminatingSymbol" + echo "\$Id: Foreign Commit With Spaces \$" + echo "\$Id: NoTerminatingSymbolAtEOF" } > expanded-keywords && { echo "File with expanded keywords" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" - echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" + echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$" echo "\$Id: NoTerminatingSymbol" + echo "\$Id: Foreign Commit With Spaces \$" + echo "\$Id: NoTerminatingSymbolAtEOF" } > expected-output && git add expanded-keywords && |