Merge branch 'sb/oid-object-info'

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index b23c4e3fab604f957ec6359eae75400dd1e53174..93c77eac45321cb24823431c4d89dc393049edbf 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -42,7 +42,7 @@ commit_subject () {
 
 error_message () {
        (cd clone &&
-        test_must_fail git rev-parse --verify "$@")
+        test_must_fail git rev-parse --verify "$@" 2>../error)
 }
 
 test_expect_success '@{upstream} resolves to correct full name' '
@@ -159,8 +159,8 @@ test_expect_success 'branch@{u} error message when no upstream' '
        cat >expect <<-EOF &&
        fatal: no upstream configured for branch ${sq}non-tracking${sq}
        EOF
-       error_message non-tracking@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message non-tracking@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when no upstream' '
@@ -175,8 +175,8 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
        cat >expect <<-EOF &&
        fatal: no such branch: ${sq}no-such-branch${sq}
        EOF
-       error_message no-such-branch@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message no-such-branch@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success '@{u} error message when not on a branch' '
@@ -192,8 +192,8 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
        cat >expect <<-EOF &&
        fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
        EOF
-       error_message bad-upstream@{u} 2>actual &&
-       test_i18ncmp expect actual
+       error_message bad-upstream@{u} &&
+       test_i18ncmp expect error
 '
 
 test_expect_success 'pull works when tracking a local branch' '
@@ -209,8 +209,9 @@ test_expect_success '@{u} works when tracking a local branch' '
        test refs/heads/master = "$(full_name @{u})"
 '
 
+commit=$(git rev-parse HEAD)
 cat >expect <<EOF
-commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+commit $commit
 Reflog: master@{0} (C O Mitter <committer@example.com>)
 Reflog message: branch: Created from HEAD
 Author: A U Thor <author@example.com>
@@ -224,7 +225,7 @@ test_expect_success 'log -g other@{u}' '
 '
 
 cat >expect <<EOF
-commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+commit $commit
 Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
 Reflog message: branch: Created from HEAD
 Author: A U Thor <author@example.com>