Re: [PATCH 06/10] Change incorrect "remote branch" to "remote tracking branch" in C code

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

 



Matthieu Moy wrote:

> I don't think any script would parse the last part of FETCH_HEAD,
> which seems really to be meant as a comment

Yes, believable.

> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:

>> Is fmt-merge-msg affected?
>
> No (that's why it's a separate patch. In case you missed my earlier
> message: yes, the testsuite passes between the two).

I suspect the testsuite passing is only because the fmt-merge-msg
tests don't try "git fetch . remotes/foo/bar".

In modern times, "git merge" bypasses fmt-merge-msg with its own
code (as you probably noticed :)).

>   In the process, we change "non-remote branch" to "branch outside
>   the refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking
>   branch". The new formulation actually corresponds to how the code
>   detects this case (i.e. prefixcmp(refname, "refs/remotes")).

Sounds good.  Thanks.
--
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]