diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 16:31:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 09:20:47 -0700 |
| commit | 13931236b9ee2895a98ffdbdacbd0f895956d8a8 (patch) | |
| tree | 88613be74b32ddbc8c42f4b0eec10d616ff846e2 /contrib | |
| parent | 29b9a66f285f602ad67362ccbe2c6bfaac769f54 (diff) | |
| download | git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.gz git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/examples/builtin-fetch--tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c index cd10dbcbc..3140e405f 100644 --- a/contrib/examples/builtin-fetch--tool.c +++ b/contrib/examples/builtin-fetch--tool.c @@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp, what = remote_name + 10; } else if (!strncmp(remote_name, "refs/remotes/", 13)) { - kind = "remote branch"; + kind = "remote-tracking branch"; what = remote_name + 13; } else { |