undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/edit-branch-desc-while-detached' into HEAD

Browse Source 
* nd/edit-branch-desc-while-detached:
  branch: no detached HEAD check when editing another branch's description
This commit is contained in:
Junio C Hamano 2013-01-30 09:01:41 -08:00
commit 35484d4acd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/branch.c
View File

@ -852,11 +852,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
const char *branch_name; const char *branch_name;
struct strbuf branch_ref = STRBUF_INIT; struct strbuf branch_ref = STRBUF_INIT;
if (detached) if (!argc) {
die("Cannot give description to detached HEAD"); if (detached)
if (!argc) die("Cannot give description to detached HEAD");
branch_name = head; branch_name = head;
else if (argc == 1) } else if (argc == 1)
branch_name = argv[0]; branch_name = argv[0];
else else
die(_("cannot edit description of more than one branch")); die(_("cannot edit description of more than one branch"));