← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to external/ngit/NGit/NGit/BranchTrackingStatus.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
external/ngit/NGit/NGit/BranchTrackingStatus.cs
68
68
                        )
69
69
                {
70
70
                        BranchConfig branchConfig = new BranchConfig(repository.GetConfig(), branchName);
71
 
                        string remoteTrackingBranch = branchConfig.GetRemoteTrackingBranch();
72
 
                        if (remoteTrackingBranch == null)
 
71
                        string trackingBranch = branchConfig.GetTrackingBranch();
 
72
                        if (trackingBranch == null)
73
73
                        {
74
74
                                return null;
75
75
                        }
76
 
                        Ref tracking = repository.GetRef(remoteTrackingBranch);
 
76
                        Ref tracking = repository.GetRef(trackingBranch);
77
77
                        if (tracking == null)
78
78
                        {
79
79
                                return null;
94
94
                        walk.SetRevFilter(RevFilter.ALL);
95
95
                        int aheadCount = RevWalkUtils.Count(walk, localCommit, mergeBase);
96
96
                        int behindCount = RevWalkUtils.Count(walk, trackingCommit, mergeBase);
97
 
                        return new NGit.BranchTrackingStatus(remoteTrackingBranch, aheadCount, behindCount
98
 
                                );
 
97
                        return new NGit.BranchTrackingStatus(trackingBranch, aheadCount, behindCount);
99
98
                }
100
99
 
101
100
                private readonly string remoteTrackingBranch;