diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-05 10:17:52 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-05 10:17:52 +0400 |
| commit | 57f75f31311d380a3ccfbfe7f483253591cf0c87 (patch) | |
| tree | 888f2fde04c7d9b3ed4af4cff48f190d26f9a9fb /t | |
| parent | 3ecd0c8b4d9e245e255aa4c061d6a474eb571298 (diff) | |
| parent | 6c41e97557d94df7085e3c0cff247305c9401968 (diff) | |
Merge branch 'cn/maint-branch-with-bad' into maint
* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists
Conflicts:
t/t3200-branch.sh
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index dd1acebd88..9fe1d8feab 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -653,4 +653,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_done |