diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-03-30 03:39:19 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-03-30 15:45:57 +0100 |
| commit | a258d8e3574c4e993bf16e0c136d1a5fbc356728 (patch) | |
| tree | 25f4fc5e103024fc592cfb568691f24a86d356b5 /src/remote.c | |
| parent | 81b8c9df4642328a7d0dc0920f1489748371d275 (diff) | |
| download | libgit2-a258d8e3574c4e993bf16e0c136d1a5fbc356728.tar.gz | |
branch: rename 'tracking' to 'upstream'
The term 'tracking' is overloaded. Help distinguish what we mean by
using 'upstream' for this part of the library.
Diffstat (limited to 'src/remote.c')
| -rw-r--r-- | src/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote.c b/src/remote.c index a6f62d6a5..896361e30 100644 --- a/src/remote.c +++ b/src/remote.c @@ -705,7 +705,7 @@ static int remote_head_for_ref(git_remote_head **out, git_remote *remote, git_ve if ((error = git_reference_resolve(&resolved_ref, ref)) < 0 || (!git_reference_is_branch(resolved_ref)) || - (error = git_branch_tracking(&tracking_ref, resolved_ref)) < 0 || + (error = git_branch_upstream(&tracking_ref, resolved_ref)) < 0 || (error = git_refspec_transform_l(&remote_name, &remote->fetch, git_reference_name(tracking_ref))) < 0) { /* Not an error if HEAD is orphaned or no tracking branch */ if (error == GIT_ENOTFOUND) |