diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-12-11 08:46:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 11:53:49 -0800 |
| commit | 1f7117ef7a39ff359a964e681f360f50d7a1c8f2 (patch) | |
| tree | 94ef4f49fa84e865f82985fc773fc2b97abb2fec /t | |
| parent | 303c5d65c972de2e9d0821647b06ab595c21d355 (diff) | |
| download | git-1f7117ef7a39ff359a964e681f360f50d7a1c8f2.tar.gz git-1f7117ef7a39ff359a964e681f360f50d7a1c8f2.tar.xz | |
sha1_file: perform object replacement in sha1_object_info_extended()
sha1_object_info_extended() should perform object replacement
if it is needed.
The simplest way to do that is to make it call
lookup_replace_object_extended().
And now its "unsigned flags" parameter is used as it is passed
to lookup_replace_object_extended().
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6050-replace.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index b90dbdcd2..bb785ec1c 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -276,7 +276,7 @@ test_expect_success '-f option bypasses the type check' ' git replace -f HEAD^ $BLOB ' -test_expect_failure 'git cat-file --batch works on replace objects' ' +test_expect_success 'git cat-file --batch works on replace objects' ' git replace | grep $PARA3 && echo $PARA3 | git cat-file --batch ' |