diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:40 -0700 |
commit | 8054b9a6153dffca012efe609ffa18004e8251e5 (patch) | |
tree | c531fc91bafab1342ca5c994b8afbb2bf77c9933 /t/t3200-branch.sh | |
parent | ed23f31bbe370eee92a06900b898a969efb80d31 (diff) | |
parent | d1520c4b1a6105356c7a2def6b90239057270598 (diff) | |
download | git-8054b9a6153dffca012efe609ffa18004e8251e5.tar.gz |
Merge branch 'jm/branch-rename-nothing-error'
"git branch -m" without any argument noticed an error, but with an
incorrect error message.
* jm/branch-rename-nothing-error:
branch: give better message when no names specified for rename
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-x | t/t3200-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index b08c9f2295..8311c7da44 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -75,7 +75,7 @@ test_expect_success 'git branch l should work after branch l/m has been deleted' test_expect_success 'git branch -m dumps usage' ' test_expect_code 128 git branch -m 2>err && - test_i18ngrep "too many branches for a rename operation" err + test_i18ngrep "branch name required" err ' test_expect_success 'git branch -m m m/m should work' ' |