mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/prune-mtime' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano
2015-03-05 13:13:08 -08:00
parent f5a191d3dc b0a4264277
commit cbc8d6d8f8
3 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t5304-prune.sh
View File

@ -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