averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'km/t1400-modernization'

Browse Source 
Code clean-up.

* km/t1400-modernization:
  t1400: use test_when_finished for cleanup
  t1400: remove a set of unused output files
  t1400: use test_path_is_* helpers
  t1400: set core.logAllRefUpdates in "logged by touch" tests
  t1400: rename test descriptions to be unique
This commit is contained in:
Junio C Hamano
2017-03-27 10:59:26 -07:00
parent a026bde1ac 2405ed07ca
commit 4a2b50a1e3
1 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
t/t1400-update-ref.sh
View File

@@ -40,7 +40,7 @@ test_expect_success \
"git update-ref $m $A && "git update-ref $m $A &&
test $A"' = $(cat .git/'"$m"')' test $A"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"create $m" \ "create $m with oldvalue verification" \
"git update-ref $m $B $A && "git update-ref $m $B $A &&
test $B"' = $(cat .git/'"$m"')' test $B"' = $(cat .git/'"$m"')'
test_expect_success "fail to delete $m with stale ref" ' test_expect_success "fail to delete $m with stale ref" '
@@ -48,31 +48,31 @@ test_expect_success "fail to delete $m with stale ref" '
test $B = "$(cat .git/$m)" test $B = "$(cat .git/$m)"
' '
test_expect_success "delete $m" ' test_expect_success "delete $m" '
test_when_finished "rm -f .git/$m" &&
git update-ref -d $m $B && git update-ref -d $m $B &&
! test -f .git/$m test_path_is_missing .git/$m
' '
rm -f .git/$m
test_expect_success "delete $m without oldvalue verification" " test_expect_success "delete $m without oldvalue verification" '
test_when_finished "rm -f .git/$m" &&
git update-ref $m $A && git update-ref $m $A &&
test $A = \$(cat .git/$m) && test $A = $(cat .git/$m) &&
git update-ref -d $m && git update-ref -d $m &&
! test -f .git/$m test_path_is_missing .git/$m
" '
rm -f .git/$m
test_expect_success \ test_expect_success "fail to create $n" '
"fail to create $n" \ test_when_finished "rm -f .git/$n_dir" &&
"touch .git/$n_dir && touch .git/$n_dir &&
test_must_fail git update-ref $n $A >out 2>err" test_must_fail git update-ref $n $A
rm -f .git/$n_dir out err '
test_expect_success \ test_expect_success \
"create $m (by HEAD)" \ "create $m (by HEAD)" \
"git update-ref HEAD $A && "git update-ref HEAD $A &&
test $A"' = $(cat .git/'"$m"')' test $A"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"create $m (by HEAD)" \ "create $m (by HEAD) with oldvalue verification" \
"git update-ref HEAD $B $A && "git update-ref HEAD $B $A &&
test $B"' = $(cat .git/'"$m"')' test $B"' = $(cat .git/'"$m"')'
test_expect_success "fail to delete $m (by HEAD) with stale ref" ' test_expect_success "fail to delete $m (by HEAD) with stale ref" '
@@ -80,28 +80,28 @@ test_expect_success "fail to delete $m (by HEAD) with stale ref" '
test $B = $(cat .git/$m) test $B = $(cat .git/$m)
' '
test_expect_success "delete $m (by HEAD)" ' test_expect_success "delete $m (by HEAD)" '
test_when_finished "rm -f .git/$m" &&
git update-ref -d HEAD $B && git update-ref -d HEAD $B &&
! test -f .git/$m test_path_is_missing .git/$m
' '
rm -f .git/$m
test_expect_success "deleting current branch adds message to HEAD's log" ' test_expect_success "deleting current branch adds message to HEAD's log" '
test_when_finished "rm -f .git/$m" &&
git update-ref $m $A && git update-ref $m $A &&
git symbolic-ref HEAD $m && git symbolic-ref HEAD $m &&
git update-ref -m delete-$m -d $m && git update-ref -m delete-$m -d $m &&
! test -f .git/$m && test_path_is_missing .git/$m &&
grep "delete-$m$" .git/logs/HEAD grep "delete-$m$" .git/logs/HEAD
' '
rm -f .git/$m
test_expect_success "deleting by HEAD adds message to HEAD's log" ' test_expect_success "deleting by HEAD adds message to HEAD's log" '
test_when_finished "rm -f .git/$m" &&
git update-ref $m $A && git update-ref $m $A &&
git symbolic-ref HEAD $m && git symbolic-ref HEAD $m &&
git update-ref -m delete-by-head -d HEAD && git update-ref -m delete-by-head -d HEAD &&
! test -f .git/$m && test_path_is_missing .git/$m &&
grep "delete-by-head$" .git/logs/HEAD grep "delete-by-head$" .git/logs/HEAD
' '
rm -f .git/$m
test_expect_success 'update-ref does not create reflogs by default' ' test_expect_success 'update-ref does not create reflogs by default' '
test_when_finished "git update-ref -d $outside" && test_when_finished "git update-ref -d $outside" &&
@@ -188,28 +188,29 @@ test_expect_success \
"git update-ref HEAD $B $A && "git update-ref HEAD $B $A &&
test $B"' = $(cat .git/'"$m"')' test $B"' = $(cat .git/'"$m"')'
test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" ' test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" '
test_when_finished "rm -f .git/$m" &&
git update-ref -d HEAD $B && git update-ref -d HEAD $B &&
! grep "$m" .git/packed-refs && ! grep "$m" .git/packed-refs &&
! test -f .git/$m test_path_is_missing .git/$m
' '
rm -f .git/$m
cp -f .git/HEAD .git/HEAD.orig cp -f .git/HEAD .git/HEAD.orig
test_expect_success "delete symref without dereference" ' test_expect_success "delete symref without dereference" '
test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
git update-ref --no-deref -d HEAD && git update-ref --no-deref -d HEAD &&
! test -f .git/HEAD test_path_is_missing .git/HEAD
' '
cp -f .git/HEAD.orig .git/HEAD
test_expect_success "delete symref without dereference when the referred ref is packed" ' test_expect_success "delete symref without dereference when the referred ref is packed" '
test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
echo foo >foo.c && echo foo >foo.c &&
git add foo.c && git add foo.c &&
git commit -m foo && git commit -m foo &&
git pack-refs --all && git pack-refs --all &&
git update-ref --no-deref -d HEAD && git update-ref --no-deref -d HEAD &&
! test -f .git/HEAD test_path_is_missing .git/HEAD
' '
cp -f .git/HEAD.orig .git/HEAD
git update-ref -d $m git update-ref -d $m
test_expect_success 'update-ref -d is not confused by self-reference' ' test_expect_success 'update-ref -d is not confused by self-reference' '
@@ -241,10 +242,10 @@ test_expect_success 'update-ref --no-deref -d can delete reference to bad ref' '
test_expect_success '(not) create HEAD with old sha1' " test_expect_success '(not) create HEAD with old sha1' "
test_must_fail git update-ref HEAD $A $B test_must_fail git update-ref HEAD $A $B
" "
test_expect_success "(not) prior created .git/$m" " test_expect_success "(not) prior created .git/$m" '
! test -f .git/$m test_when_finished "rm -f .git/$m" &&
" test_path_is_missing .git/$m
rm -f .git/$m '
test_expect_success \ test_expect_success \
"create HEAD" \ "create HEAD" \
@@ -252,38 +253,41 @@ test_expect_success \
test_expect_success '(not) change HEAD with wrong SHA1' " test_expect_success '(not) change HEAD with wrong SHA1' "
test_must_fail git update-ref HEAD $B $Z test_must_fail git update-ref HEAD $B $Z
" "
test_expect_success "(not) changed .git/$m" " test_expect_success "(not) changed .git/$m" '
! test $B"' = $(cat .git/'"$m"') test_when_finished "rm -f .git/$m" &&
! test $B = $(cat .git/$m)
' '
rm -f .git/$m
rm -f .git/logs/refs/heads/master rm -f .git/logs/refs/heads/master
test_expect_success \ test_expect_success \
"create $m (logged by touch)" \ "create $m (logged by touch)" \
'GIT_COMMITTER_DATE="2005-05-26 23:30" \ 'test_config core.logAllRefUpdates false &&
GIT_COMMITTER_DATE="2005-05-26 23:30" \
git update-ref --create-reflog HEAD '"$A"' -m "Initial Creation" && git update-ref --create-reflog HEAD '"$A"' -m "Initial Creation" &&
test '"$A"' = $(cat .git/'"$m"')' test '"$A"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"update $m (logged by touch)" \ "update $m (logged by touch)" \
'GIT_COMMITTER_DATE="2005-05-26 23:31" \ 'test_config core.logAllRefUpdates false &&
GIT_COMMITTER_DATE="2005-05-26 23:31" \
git update-ref HEAD'" $B $A "'-m "Switch" && git update-ref HEAD'" $B $A "'-m "Switch" &&
test '"$B"' = $(cat .git/'"$m"')' test '"$B"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"set $m (logged by touch)" \ "set $m (logged by touch)" \
'GIT_COMMITTER_DATE="2005-05-26 23:41" \ 'test_config core.logAllRefUpdates false &&
GIT_COMMITTER_DATE="2005-05-26 23:41" \
git update-ref HEAD'" $A && git update-ref HEAD'" $A &&
test $A"' = $(cat .git/'"$m"')' test $A"' = $(cat .git/'"$m"')'
test_expect_success "empty directory removal" ' test_expect_success "empty directory removal" '
git branch d1/d2/r1 HEAD && git branch d1/d2/r1 HEAD &&
git branch d1/r2 HEAD && git branch d1/r2 HEAD &&
test -f .git/refs/heads/d1/d2/r1 && test_path_is_file .git/refs/heads/d1/d2/r1 &&
test -f .git/logs/refs/heads/d1/d2/r1 && test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
git branch -d d1/d2/r1 && git branch -d d1/d2/r1 &&
! test -e .git/refs/heads/d1/d2 && test_path_is_missing .git/refs/heads/d1/d2 &&
! test -e .git/logs/refs/heads/d1/d2 && test_path_is_missing .git/logs/refs/heads/d1/d2 &&
test -f .git/refs/heads/d1/r2 && test_path_is_file .git/refs/heads/d1/r2 &&
test -f .git/logs/refs/heads/d1/r2 test_path_is_file .git/logs/refs/heads/d1/r2
' '
test_expect_success "symref empty directory removal" ' test_expect_success "symref empty directory removal" '
@@ -291,14 +295,14 @@ test_expect_success "symref empty directory removal" '
git branch e1/r2 HEAD && git branch e1/r2 HEAD &&
git checkout e1/e2/r1 && git checkout e1/e2/r1 &&
test_when_finished "git checkout master" && test_when_finished "git checkout master" &&
test -f .git/refs/heads/e1/e2/r1 && test_path_is_file .git/refs/heads/e1/e2/r1 &&
test -f .git/logs/refs/heads/e1/e2/r1 && test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
git update-ref -d HEAD && git update-ref -d HEAD &&
! test -e .git/refs/heads/e1/e2 && test_path_is_missing .git/refs/heads/e1/e2 &&
! test -e .git/logs/refs/heads/e1/e2 && test_path_is_missing .git/logs/refs/heads/e1/e2 &&
test -f .git/refs/heads/e1/r2 && test_path_is_file .git/refs/heads/e1/r2 &&
test -f .git/logs/refs/heads/e1/r2 && test_path_is_file .git/logs/refs/heads/e1/r2 &&
test -f .git/logs/HEAD test_path_is_file .git/logs/HEAD
' '
cat >expect <<EOF cat >expect <<EOF
@@ -306,29 +310,27 @@ $Z $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 Initial Creati
$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000 Switch $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000 Switch
$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000 $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
EOF EOF
test_expect_success \ test_expect_success "verifying $m's log (logged by touch)" '
"verifying $m's log" \ test_when_finished "rm -rf .git/$m .git/logs expect" &&
"test_cmp expect .git/logs/$m" test_cmp expect .git/logs/$m
rm -rf .git/$m .git/logs expect '
test_expect_success \
'enable core.logAllRefUpdates' \
'git config core.logAllRefUpdates true &&
test true = $(git config --bool --get core.logAllRefUpdates)'
test_expect_success \ test_expect_success \
"create $m (logged by config)" \ "create $m (logged by config)" \
'GIT_COMMITTER_DATE="2005-05-26 23:32" \ 'test_config core.logAllRefUpdates true &&
GIT_COMMITTER_DATE="2005-05-26 23:32" \
git update-ref HEAD'" $A "'-m "Initial Creation" && git update-ref HEAD'" $A "'-m "Initial Creation" &&
test '"$A"' = $(cat .git/'"$m"')' test '"$A"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"update $m (logged by config)" \ "update $m (logged by config)" \
'GIT_COMMITTER_DATE="2005-05-26 23:33" \ 'test_config core.logAllRefUpdates true &&
GIT_COMMITTER_DATE="2005-05-26 23:33" \
git update-ref HEAD'" $B $A "'-m "Switch" && git update-ref HEAD'" $B $A "'-m "Switch" &&
test '"$B"' = $(cat .git/'"$m"')' test '"$B"' = $(cat .git/'"$m"')'
test_expect_success \ test_expect_success \
"set $m (logged by config)" \ "set $m (logged by config)" \
'GIT_COMMITTER_DATE="2005-05-26 23:43" \ 'test_config core.logAllRefUpdates true &&
GIT_COMMITTER_DATE="2005-05-26 23:43" \
git update-ref HEAD '"$A && git update-ref HEAD '"$A &&
test $A"' = $(cat .git/'"$m"')' test $A"' = $(cat .git/'"$m"')'
@@ -338,9 +340,9 @@ $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 +0000 Switch
$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000 $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000
EOF EOF
test_expect_success \ test_expect_success \
"verifying $m's log" \ "verifying $m's log (logged by config)" \
'test_cmp expect .git/logs/$m' 'test_when_finished "rm -f .git/$m .git/logs/$m expect" &&
rm -f .git/$m .git/logs/$m expect test_cmp expect .git/logs/$m'
git update-ref $m $D git update-ref $m $D
cat >.git/logs/$m <<EOF cat >.git/logs/$m <<EOF
@@ -356,55 +358,55 @@ gd="Thu, 26 May 2005 18:33:00 -0500"
ld="Thu, 26 May 2005 18:43:00 -0500" ld="Thu, 26 May 2005 18:43:00 -0500"
test_expect_success \ test_expect_success \
'Query "master@{May 25 2005}" (before history)' \ 'Query "master@{May 25 2005}" (before history)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{May 25 2005}" >o 2>e && git rev-parse --verify "master@{May 25 2005}" >o 2>e &&
test '"$C"' = $(cat o) && test '"$C"' = $(cat o) &&
test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"' test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
test_expect_success \ test_expect_success \
"Query master@{2005-05-25} (before history)" \ "Query master@{2005-05-25} (before history)" \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify master@{2005-05-25} >o 2>e && git rev-parse --verify master@{2005-05-25} >o 2>e &&
test '"$C"' = $(cat o) && test '"$C"' = $(cat o) &&
echo test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"' echo test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \ 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e && git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
test '"$C"' = $(cat o) && test '"$C"' = $(cat o) &&
test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"' test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \ 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e && git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
test '"$C"' = $(cat o) && test '"$C"' = $(cat o) &&
test "" = "$(cat e)"' test "" = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' \ 'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e && git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e &&
test '"$A"' = $(cat o) && test '"$A"' = $(cat o) &&
test "" = "$(cat e)"' test "" = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \ 'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e && git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
test '"$B"' = $(cat o) && test '"$B"' = $(cat o) &&
test "warning: Log for ref '"$m has gap after $gd"'." = "$(cat e)"' test "warning: Log for ref '"$m has gap after $gd"'." = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{2005-05-26 23:38:00}" (middle of history)' \ 'Query "master@{2005-05-26 23:38:00}" (middle of history)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e && git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
test '"$Z"' = $(cat o) && test '"$Z"' = $(cat o) &&
test "" = "$(cat e)"' test "" = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \ 'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e && git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
test '"$E"' = $(cat o) && test '"$E"' = $(cat o) &&
test "" = "$(cat e)"' test "" = "$(cat e)"'
test_expect_success \ test_expect_success \
'Query "master@{2005-05-28}" (past end of history)' \ 'Query "master@{2005-05-28}" (past end of history)' \
'rm -f o e && 'test_when_finished "rm -f o e" &&
git rev-parse --verify "master@{2005-05-28}" >o 2>e && git rev-parse --verify "master@{2005-05-28}" >o 2>e &&
test '"$D"' = $(cat o) && test '"$D"' = $(cat o) &&
test "warning: Log for ref '"$m unexpectedly ended on $ld"'." = "$(cat e)"' test "warning: Log for ref '"$m unexpectedly ended on $ld"'." = "$(cat e)"'
@@ -414,7 +416,8 @@ rm -f .git/$m .git/logs/$m expect
test_expect_success \ test_expect_success \
'creating initial files' \ 'creating initial files' \
'echo TEST >F && 'test_when_finished rm -f M &&
echo TEST >F &&
git add F && git add F &&
GIT_AUTHOR_DATE="2005-05-26 23:30" \ GIT_AUTHOR_DATE="2005-05-26 23:30" \
GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a && GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a &&
@@ -432,8 +435,7 @@ test_expect_success \
echo $h_TEST >.git/MERGE_HEAD && echo $h_TEST >.git/MERGE_HEAD &&
GIT_AUTHOR_DATE="2005-05-26 23:45" \ GIT_AUTHOR_DATE="2005-05-26 23:45" \
GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M && GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M &&
h_MERGED=$(git rev-parse --verify HEAD) && h_MERGED=$(git rev-parse --verify HEAD)'
rm -f M'
cat >expect <<EOF cat >expect <<EOF
$Z $h_TEST $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 commit (initial): add $Z $h_TEST $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 commit (initial): add