From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Feb 2013 20:40:52 +0000 (-0800)
Subject: Merge branch 'nd/edit-branch-desc-while-detached'
X-Git-Tag: v1.8.2-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3c0f7773feae66f5744cb33d0b074f0ef0c18a7?hp=4acfff9dda29ae700c8b053cf7af9d4bcdf73762

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

Attempt to "branch --edit-description" an existing branch, while
being on a detached HEAD, errored out.

* nd/edit-branch-desc-while-detached:
branch: no detached HEAD check when editing another branch's description
---

diff --git a/builtin/branch.c b/builtin/branch.c
index 873f624d1c..ea6498b08a 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -850,11 +850,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		const char *branch_name;
 		struct strbuf branch_ref = STRBUF_INIT;
 
-		if (detached)
-			die("Cannot give description to detached HEAD");
-		if (!argc)
+		if (!argc) {
+			if (detached)
+				die("Cannot give description to detached HEAD");
 			branch_name = head;
-		else if (argc == 1)
+		} else if (argc == 1)
 			branch_name = argv[0];
 		else
 			usage_with_options(builtin_branch_usage, options);