development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jm/branch-rename-nothing-error'

Browse source 
"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
This commit is contained in:
Junio C Hamano 2013-04-03 09:34:40 -07:00
commit 8054b9a615
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/branch.c
View file

@ -904,7 +904,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (edit_branch_description(branch_name))
return 1;
} else if (rename) {
if (argc == 1)
if (!argc)
die(_("branch name required"));
else if (argc == 1)
rename_branch(head, argv[0], rename > 1);
else if (argc == 2)
rename_branch(argv[0], argv[1], rename > 1);

2
t/t3200-branch.sh
View file

@ -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' '