Re: [PATCH] Fetch: get the remote branches to merge from the branch properties.

From: Junio C Hamano <junkio@cox.net>
Date: Sep 23, 2006, 00:45 UTC
Message-ID: <7vac4rxvep.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <874puza2qq.fsf@gmail.com>

Show 8 quoted lines

> If in branch "foo" and this in config:
>
> [branch "foo"]
>        merge=3Dbar
>
> "git fetch": fetch from the default repository and program the "bar"
>              branch to be merged with pull.
>

Your patch has a very strange whitespace damage in it, and I am not talking about quoted-printable encoding.

Show 9 quoted lines

> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index fa20e28..b4de243 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -122,6 +122,10 @@ apply.whitespace::
>  branch.<name>.remote::
>         When in branch <name>, it tells `git pull` which remote to fetc=
> h.
>

A tab in context before "When" is expanded into spaces, and the empty line in the context does not have the leading SP.

Show 5 quoted lines

> +branch.<name>.merge::
> +       When in branch <name>, it tells `git fetch` the remote branch t=
> o be
> +       merged.
> +

I suspect you wanted to start the new line with a leading tab before "When" but it is expanded into spaces here.

However, the diff for the other file in the same patch does not have this problem.

No need to resend, as I hand-applied it to a new topic, but I am a bit curious why one diff is broken when the other one is not in the same e-mail message.