diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-01 14:44:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 14:44:17 -0800 |
| commit | 7d47367a47c8811f62ad8787091cb27e507c165e (patch) | |
| tree | 2bbbbe59da90ccf5ada1391cce11cb0a0d87426d /t/t3200-branch.sh | |
| parent | f051ad6d118aff0252beed36d20a56d1823fc90b (diff) | |
| parent | 6c41e97557d94df7085e3c0cff247305c9401968 (diff) | |
| download | git-7d47367a47c8811f62ad8787091cb27e507c165e.tar.gz git-7d47367a47c8811f62ad8787091cb27e507c165e.tar.xz | |
Merge branch 'cn/maint-branch-with-bad'
* cn/maint-branch-with-bad:
branch: don't assume the merge filter ref exists
Conflicts:
t/t3200-branch.sh
Diffstat (limited to 't/t3200-branch.sh')
| -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 dd1acebd8..9fe1d8fea 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 |