Re: [PATCH v2 1/3] branch: reject -D/-d without branch name

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH v2 1/3] branch: reject -D/-d without branch name

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:54

Nguyễn Thái Ngọc Duy [off-list ref] writes:
---
 builtin/branch.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Forgot to sign-off?

Is this a real problem?

I do not see it particularly wrong to succeed after deleting 0 or
more given branch names.
quoted hunk
diff --git a/builtin/branch.c b/builtin/branch.c
index 873f624..50fcacc 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -837,9 +837,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		colopts = 0;
 	}
 
-	if (delete)
+	if (delete) {
+		if (!argc)
+			die(_("branch name required"));
 		return delete_branches(argc, argv, delete > 1, kinds, quiet);
-	else if (list) {
+	} else if (list) {
 		int ret = print_ref_list(kinds, detached, verbose, abbrev,
 					 with_commit, argv);
 		print_columns(&output, colopts, NULL);

Re: [PATCH v2 1/3] branch: reject -D/-d without branch name

From: Duy Nguyen <hidden>
Date: 2016-06-15 22:55:54

On Sat, Jan 26, 2013 at 2:04 AM, Junio C Hamano [off-list ref] wrote:
Nguyễn Thái Ngọc Duy [off-list ref] writes:
quoted
---
 builtin/branch.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Forgot to sign-off?
Yes
Is this a real problem?
Yes. My thoughts yesterday when I happened to type "git branch -D":

"Wait, I just entered a delete command without a branch name. It did
not report anything, which in UNIX world usually means successful
operation. _What_ did it delete??"

I knew this code so I just went check. If I did not know, I might as
well list all branches I had and see if something was missing. A short
message would have saved me the trouble.
I do not see it particularly wrong to succeed after deleting 0 or
more given branch names.
-- 
Duy
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help