Merge branch 'maint'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index ebf93b0695dfac37fc276e1f07377d858eb3e1da..998503db12eb115e8e160937d456dfd9cb46311f 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -134,12 +134,14 @@ test_expect_success 'fail when upstream arg is missing and not configured' '
        test_must_fail git rebase
 '
 
-test_expect_success 'default to @{upstream} when upstream arg is missing' '
+test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
        git checkout -b default topic &&
        git config branch.default.remote . &&
        git config branch.default.merge refs/heads/master &&
        git rebase &&
-       test "$(git rev-parse default~1)" = "$(git rev-parse master)"
+       git rev-parse --verify master >expect &&
+       git rev-parse default~1 >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'rebase -q is quiet' '