From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 28 Jan 2013 01:18:13 +0000 (+0700)
Subject: branch: no detached HEAD check when editing another branch's description
X-Git-Tag: v1.8.1.3~10^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/75135b23f66afd362c864939ecd0d6871a87d769?ds=inline;hp=--cc

branch: no detached HEAD check when editing another branch's description

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

75135b23f66afd362c864939ecd0d6871a87d769
diff --git a/builtin/branch.c b/builtin/branch.c
index 0e060f2e4a..ea10bce3ba 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -822,11 +822,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);