diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-04 13:53:58 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-04 13:53:58 -0700 |
commit | 5b137e84410ff7c83b854cb7b9e933c4d3673555 (patch) | |
tree | 3ae3acf1f19afaba2c07a35fbd9992f300a00720 /t | |
parent | Merge branch 'jt/pack-objects-prefetch-in-batch' (diff) | |
parent | sha1-file: make pretend_object_file() not prefetch (diff) | |
download | tgif-5b137e84410ff7c83b854cb7b9e933c4d3673555.tar.xz |
Merge branch 'jt/pretend-object-never-come-from-elsewhere'
The pretend-object mechanism checks if the given object already
exists in the object store before deciding to keep the data
in-core, but the check would have triggered lazy fetching of such
an object from a promissor remote.
* jt/pretend-object-never-come-from-elsewhere:
sha1-file: make pretend_object_file() not prefetch
Diffstat (limited to 't')
-rwxr-xr-x | t/t8002-blame.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh index eea048e52c..2ed6aaae35 100755 --- a/t/t8002-blame.sh +++ b/t/t8002-blame.sh @@ -122,4 +122,15 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' ' test_must_fail git blame --exclude-promisor-objects one ' +test_expect_success 'blame with uncommitted edits in partial clone does not crash' ' + git init server && + echo foo >server/file.txt && + git -C server add file.txt && + git -C server commit -m file && + + git clone --filter=blob:none "file://$(pwd)/server" client && + echo bar >>client/file.txt && + git -C client blame file.txt +' + test_done |