From: Junio C Hamano Date: Wed, 7 Jan 2015 21:08:26 +0000 (-0800) Subject: Merge branch 'sb/t5400-remove-unused' X-Git-Tag: v2.3.0-rc0~18 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d2c1bf2d44ccae8fc696263c771f9c53ca1576e?hp=-c Merge branch 'sb/t5400-remove-unused' * sb/t5400-remove-unused: t5400: remove dead code --- 3d2c1bf2d44ccae8fc696263c771f9c53ca1576e diff --combined t/t5400-send-pack.sh index 0736bcbcd5,0d0b6e2290..04cea97f87 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@@ -76,8 -76,7 +76,7 @@@ test_expect_success 'refuse pushing rew test "$victim_head" = "$pushed_head" ' - test_expect_success \ - 'push can be used to delete a ref' ' + test_expect_success 'push can be used to delete a ref' ' ( cd victim && git branch extra master ) && git send-pack ./victim :extra master && ( cd victim && @@@ -145,41 -144,6 +144,41 @@@ test_expect_success 'push --all exclude ) ' +test_expect_success 'receive-pack runs auto-gc in remote repo' ' + rm -rf parent child && + git init parent && + ( + # Setup a repo with 2 packs + cd parent && + echo "Some text" >file.txt && + git add . && + git commit -m "Initial commit" && + git repack -adl && + echo "Some more text" >>file.txt && + git commit -a -m "Second commit" && + git repack + ) && + cp -R parent child && + ( + # Set the child to auto-pack if more than one pack exists + cd child && + git config gc.autopacklimit 1 && + git config gc.autodetach false && + git branch test_auto_gc && + # And create a file that follows the temporary object naming + # convention for the auto-gc to remove + : >.git/objects/tmp_test_object && + test-chmtime =-1209601 .git/objects/tmp_test_object + ) && + ( + cd parent && + echo "Even more text" >>file.txt && + git commit -a -m "Third commit" && + git send-pack ../child HEAD:refs/heads/test_auto_gc + ) && + test ! -e child/.git/objects/tmp_test_object +' + rewound_push_setup() { rm -rf parent child && mkdir parent && @@@ -196,19 -160,6 +195,6 @@@ ) } - rewound_push_succeeded() { - cmp ../parent/.git/refs/heads/master .git/refs/heads/master - } - - rewound_push_failed() { - if rewound_push_succeeded - then - false - else - true - fi - } - test_expect_success 'pushing explicit refspecs respects forcing' ' rewound_push_setup && parent_orig=$(cd parent && git rev-parse --verify master) &&