undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/t7509: remove unnecessary manipulation of reflog

Browse Source 
Remove unnecessary reflog manipulation.  The test does not rely in any
way on this reflog manipulation, and the case that the test
exercises is unrelated to reflogs.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Turner 2015-07-27 18:57:07 -04:00 committed by Junio C Hamano
parent ca00f80b58
commit 86b601c5d8
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
t/t7509-commit.sh
View File

@ -90,22 +90,10 @@ sha1_file() {
remove_object() { remove_object() {
rm -f $(sha1_file "$*") rm -f $(sha1_file "$*")
} }
no_reflog() {
cp .git/config .git/config.saved &&
echo "[core] logallrefupdates = false" >>.git/config &&
test_when_finished "mv -f .git/config.saved .git/config" &&
if test -e .git/logs
then
mv .git/logs . &&
test_when_finished "mv logs .git/"
fi
}
test_expect_success '--amend option with empty author' ' test_expect_success '--amend option with empty author' '
git cat-file commit Initial >tmp && git cat-file commit Initial >tmp &&
sed "s/author [^<]* </author </" tmp >empty-author && sed "s/author [^<]* </author </" tmp >empty-author &&
no_reflog &&
sha=$(git hash-object -t commit -w empty-author) && sha=$(git hash-object -t commit -w empty-author) &&
test_when_finished "remove_object $sha" && test_when_finished "remove_object $sha" &&
git checkout $sha && git checkout $sha &&
@ -119,7 +107,6 @@ test_expect_success '--amend option with empty author' '
test_expect_success '--amend option with missing author' ' test_expect_success '--amend option with missing author' '
git cat-file commit Initial >tmp && git cat-file commit Initial >tmp &&
sed "s/author [^<]* </author </" tmp >malformed && sed "s/author [^<]* </author </" tmp >malformed &&
no_reflog &&
sha=$(git hash-object -t commit -w malformed) && sha=$(git hash-object -t commit -w malformed) &&
test_when_finished "remove_object $sha" && test_when_finished "remove_object $sha" &&
git checkout $sha && git checkout $sha &&