diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 00:13:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 00:13:08 +0300 |
| commit | cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288 (patch) | |
| tree | 348aa7a55aa16299c5935e18bbe69acdc5129f10 /t | |
| parent | f5a191d3dcbd0deaae9eba2a141e0f086ea0eb20 (diff) | |
| parent | b0a4264277b7968741580093e7ea1e366943d297 (diff) | |
Merge branch 'jk/prune-mtime' into maint
In v2.2.0, we broke "git prune" that runs in a repository that
borrows from an alternate object store.
* jk/prune-mtime:
sha1_file: fix iterating loose alternate objects
for_each_loose_file_in_objdir: take an optional strbuf path
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5304-prune.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index e32e46dee1..0794d33dad 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -253,4 +253,12 @@ test_expect_success 'prune .git/shallow' ' test_path_is_missing .git/shallow ' +test_expect_success 'prune: handle alternate object database' ' + test_create_repo A && + git -C A commit --allow-empty -m "initial commit" && + git clone --shared A B && + git -C B commit --allow-empty -m "next commit" && + git -C B prune +' + test_done |