DORMANTno replies

[PATCH] fmt-merge-msg: detached HEAD

From: Santi Béjar <hidden>
Date: 2016-06-15 22:42:50
Subsystem: the rest · Maintainer: Linus Torvalds

Do not say 'Merge ... into HEAD' when detached.

Signed-off-by: Santi Béjar <redacted>
---
 builtin-fmt-merge-msg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 87d3d63..8cef425 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 			printf(" of %s", srcs.list[i]);
 	}
 
-	if (!strcmp("master", current_branch))
+	if (!strcmp("master", current_branch) ||
+	    !strcmp("HEAD", current_branch))
 		putchar('\n');
 	else
 		printf(" into %s\n", current_branch);
-- 
1.5.0.rc2.g2fa185-dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help