mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/branch-cleanup'

Browse Source 
Code clean-up around "git branch" with a minor bugfix.

* dl/branch-cleanup:
  branch: don't mix --edit-description
  t3200: test for specific errors
  t3200: rename "expected" to "expect"
This commit is contained in:
Junio C Hamano
2020-06-25 12:27:46 -07:00
parent eb52351a1c dc44639904
commit 7b2685ef2d
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -693,7 +693,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
list = 1;
if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
list + unset_upstream > 1)
list + edit_description + unset_upstream > 1)
usage_with_options(builtin_branch_usage, options);
if (filter.abbrev == -1)