From: Junio C Hamano <junkio@cox.net>
Date: Fri, 26 Jan 2007 00:16:51 GMT
Subject: Re: [PATCH] fmt-merge-msg: detached HEAD
Message-ID: <7vireu63rg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <87zm875d9u.fsf@gmail.com>

Santi Béjar <sbejar@gmail.com> writes:

> Do not say 'Merge ... into HEAD' when detached.
>
> Signed-off-by: Santi Béjar <sbejar@gmail.com>
> ---
>  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);

Hmph.

The reason is?