Change incorrect "remote branch" to "remote tracking branch" in C code
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Tue, 2 Nov 2010 15:31:25 +0000 (16:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Nov 2010 16:20:47 +0000 (09:20 -0700)
commit13931236b9ee2895a98ffdbdacbd0f895956d8a8
tree88613be74b32ddbc8c42f4b0eec10d616ff846e2
parent29b9a66f285f602ad67362ccbe2c6bfaac769f54
Change incorrect "remote branch" to "remote tracking branch" in C code

(Just like we did for documentation already)

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")).

Also, we use 'remote-tracking branch' in generated merge messages (by
merge an fmt-merge-msg).

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
branch.h
builtin/fetch.c
builtin/fmt-merge-msg.c
builtin/merge.c
builtin/remote.c
contrib/examples/builtin-fetch--tool.c
t/t1507-rev-parse-upstream.sh
t/t3409-rebase-preserve-merges.sh
t/t5505-remote.sh
t/t7608-merge-messages.sh