fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 5637cb5eac2fa77ec3882263418c363a4da8a69a..78cd41245b301e731dc0fdd0066b3d3bac4f5405 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -3,64 +3,71 @@
 # Copyright (c) 2006 Shawn Pearce
 #
 
-test_description='Test git-update-ref and basic ref logging'
+test_description='Test git update-ref and basic ref logging'
 . ./test-lib.sh
 
 Z=0000000000000000000000000000000000000000
-A=1111111111111111111111111111111111111111
-B=2222222222222222222222222222222222222222
-C=3333333333333333333333333333333333333333
-D=4444444444444444444444444444444444444444
-E=5555555555555555555555555555555555555555
-F=6666666666666666666666666666666666666666
+
+test_expect_success setup '
+
+       for name in A B C D E F
+       do
+               test_tick &&
+               T=$(git write-tree) &&
+               sha1=$(echo $name | git commit-tree $T) &&
+               eval $name=$sha1
+       done
+
+'
+
 m=refs/heads/master
 n_dir=refs/heads/gu
 n=$n_dir/fixes
 
 test_expect_success \
        "create $m" \
-       "git-update-ref $m $A &&
+       "git update-ref $m $A &&
         test $A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "create $m" \
-       "git-update-ref $m $B $A &&
+       "git update-ref $m $B $A &&
         test $B"' = $(cat .git/'"$m"')'
 rm -f .git/$m
 
 test_expect_success \
        "fail to create $n" \
        "touch .git/$n_dir
-        git-update-ref $n $A >out 2>err"'
+        git update-ref $n $A >out 2>err"'
         test $? != 0'
 rm -f .git/$n_dir out err
 
 test_expect_success \
        "create $m (by HEAD)" \
-       "git-update-ref HEAD $A &&
+       "git update-ref HEAD $A &&
         test $A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "create $m (by HEAD)" \
-       "git-update-ref HEAD $B $A &&
+       "git update-ref HEAD $B $A &&
         test $B"' = $(cat .git/'"$m"')'
 rm -f .git/$m
 
-test_expect_failure \
-       '(not) create HEAD with old sha1' \
-       "git-update-ref HEAD $A $B"
-test_expect_failure \
-       "(not) prior created .git/$m" \
-       "test -f .git/$m"
+test_expect_success '(not) create HEAD with old sha1' "
+       ! git update-ref HEAD $A $B
+"
+test_expect_success "(not) prior created .git/$m" "
+       ! test -f .git/$m
+"
 rm -f .git/$m
 
 test_expect_success \
        "create HEAD" \
-       "git-update-ref HEAD $A"
-test_expect_failure \
-       '(not) change HEAD with wrong SHA1' \
-       "git-update-ref HEAD $B $Z"
-test_expect_failure \
-       "(not) changed .git/$m" \
-       "test $B"' = $(cat .git/'"$m"')'
+       "git update-ref HEAD $A"
+test_expect_success '(not) change HEAD with wrong SHA1' "
+       ! git update-ref HEAD $B $Z
+"
+test_expect_success "(not) changed .git/$m" "
+       ! test $B"' = $(cat .git/'"$m"')
+'
 rm -f .git/$m
 
 : a repository with working tree always has reflog these days...
@@ -68,17 +75,17 @@ rm -f .git/$m
 test_expect_success \
        "create $m (logged by touch)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:30" \
-        git-update-ref HEAD '"$A"' -m "Initial Creation" &&
+        git update-ref HEAD '"$A"' -m "Initial Creation" &&
         test '"$A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "update $m (logged by touch)" \
        '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_expect_success \
        "set $m (logged by touch)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:41" \
-        git-update-ref HEAD'" $A &&
+        git update-ref HEAD'" $A &&
         test $A"' = $(cat .git/'"$m"')'
 
 cat >expect <<EOF
@@ -93,23 +100,23 @@ rm -rf .git/$m .git/logs expect
 
 test_expect_success \
        'enable core.logAllRefUpdates' \
-       'git-repo-config core.logAllRefUpdates true &&
-        test true = $(git-repo-config --bool --get core.logAllRefUpdates)'
+       'git config core.logAllRefUpdates true &&
+        test true = $(git config --bool --get core.logAllRefUpdates)'
 
 test_expect_success \
        "create $m (logged by config)" \
        '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_expect_success \
        "update $m (logged by config)" \
        '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_expect_success \
        "set $m (logged by config)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:43" \
-        git-update-ref HEAD '"$A &&
+        git update-ref HEAD '"$A &&
         test $A"' = $(cat .git/'"$m"')'
 
 cat >expect <<EOF
@@ -122,7 +129,7 @@ test_expect_success \
        'diff expect .git/logs/$m'
 rm -f .git/$m .git/logs/$m expect
 
-git-update-ref $m $D
+git update-ref $m $D
 cat >.git/logs/$m <<EOF
 $C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
 $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
@@ -136,49 +143,49 @@ ld="Thu, 26 May 2005 18:43:00 -0500"
 test_expect_success \
        'Query "master@{May 25 2005}" (before history)' \
        '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 "warning: Log .git/logs/'"$m only goes back to $ed"'." = "$(cat e)"'
+        test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
 test_expect_success \
        "Query master@{2005-05-25} (before history)" \
        '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) &&
-        echo test "warning: Log .git/logs/'"$m only goes back to $ed"'." = "$(cat e)"'
+        echo test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
 test_expect_success \
        'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \
        '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 "warning: Log .git/logs/'"$m only goes back to $ed"'." = "$(cat e)"'
+        test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"'
 test_expect_success \
        'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \
        '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 '"$A"' = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
        'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \
        '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 "warning: Log .git/logs/'"$m has gap after $gd"'." = "$(cat e)"'
 test_expect_success \
        'Query "master@{2005-05-26 23:38:00}" (middle of history)' \
        '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 "" = "$(cat e)"'
 test_expect_success \
        'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \
        '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 "" = "$(cat e)"'
 test_expect_success \
        'Query "master@{2005-05-28}" (past end of history)' \
        '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 "warning: Log .git/logs/'"$m unexpectedly ended on $ld"'." = "$(cat e)"'
 
@@ -188,26 +195,24 @@ rm -f .git/$m .git/logs/$m expect
 test_expect_success \
     'creating initial files' \
     'echo TEST >F &&
-     git-add F &&
+     git add F &&
         GIT_AUTHOR_DATE="2005-05-26 23:30" \
         GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
-        h_TEST=$(git-rev-parse --verify HEAD)
+        h_TEST=$(git rev-parse --verify HEAD)
         echo The other day this did not work. >M &&
         echo And then Bob told me how to fix it. >>M &&
         echo OTHER >F &&
         GIT_AUTHOR_DATE="2005-05-26 23:41" \
         GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
-        h_OTHER=$(git-rev-parse --verify HEAD) &&
-        echo FIXED >F &&
+        h_OTHER=$(git rev-parse --verify HEAD) &&
         GIT_AUTHOR_DATE="2005-05-26 23:44" \
         GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
-        h_FIXED=$(git-rev-parse --verify HEAD) &&
-        echo TEST+FIXED >F &&
+        h_FIXED=$(git rev-parse --verify HEAD) &&
         echo Merged initial commit and a later commit. >M &&
         echo $h_TEST >.git/MERGE_HEAD &&
         GIT_AUTHOR_DATE="2005-05-26 23:45" \
         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
@@ -222,13 +227,13 @@ test_expect_success \
 unset h_TEST h_OTHER h_FIXED h_MERGED
 
 test_expect_success \
-       'git-cat-file blob master:F (expect OTHER)' \
-       'test OTHER = $(git-cat-file blob master:F)'
+       'git cat-file blob master:F (expect OTHER)' \
+       'test OTHER = $(git cat-file blob master:F)'
 test_expect_success \
-       'git-cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \
-       'test TEST = $(git-cat-file blob "master@{2005-05-26 23:30}:F")'
+       'git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \
+       'test TEST = $(git cat-file blob "master@{2005-05-26 23:30}:F")'
 test_expect_success \
-       'git-cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \
-       'test OTHER = $(git-cat-file blob "master@{2005-05-26 23:42}:F")'
+       'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \
+       'test OTHER = $(git cat-file blob "master@{2005-05-26 23:42}:F")'
 
 test_done