Re: [PATCH] fmt-merge-msg: detached HEAD

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Santi Béjar <sbejar@xxxxxxxxx> writes:

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


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]