aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xt/t3200-branch.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index c58e505c43..e7829c2c4b 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1494,7 +1494,8 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
'
test_expect_success '--merged catches invalid object names' '
- test_must_fail git branch --merged 0000000000000000000000000000000000000000
+ test_must_fail git branch --merged $ZERO_OID 2>err &&
+ test_grep "must point to a commit" err
'
test_expect_success '--list during rebase' '