diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-03 10:01:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 16:42:22 -0700 |
| commit | da3ac0c14993c5e8e41875cc3ead32be71647a7a (patch) | |
| tree | 051d70fc773165ff5120725910b69bbe89c7e872 /t | |
| parent | daba53aeaf6565b4bbdd6783c659480453ec3c5e (diff) | |
| download | git-da3ac0c14993c5e8e41875cc3ead32be71647a7a.tar.gz git-da3ac0c14993c5e8e41875cc3ead32be71647a7a.tar.xz | |
apply: --build-fake-ancestor expects blobs
The "index" line read from the patch to reconstruct a partial
preimage tree records the object names of blob objects.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1512-rev-parse-disambiguation.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index fbd3658ca..84b8dddbe 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -54,7 +54,7 @@ test_expect_success 'disambiguate tree-ish' ' git rev-parse --verify 000000000:a0blgqsjc ' -test_expect_failure 'disambiguate blob' ' +test_expect_success 'disambiguate blob' ' sed -e "s/|$//" >patch <<-EOF && diff --git a/frotz b/frotz index 000000000..ffffff 100644 |