equal
deleted
inserted
replaced
1264 remote = b |
1264 remote = b |
1265 break |
1265 break |
1266 |
1266 |
1267 if remote not in tracking: |
1267 if remote not in tracking: |
1268 # create a new local tracking branch |
1268 # create a new local tracking branch |
1269 local = remote.split('/', 2)[2] |
1269 local = remote.split('/', 3)[3] |
1270 checkout(['-b', local, remote]) |
1270 checkout(['-b', local, remote]) |
1271 elif self._gitisancestor(branch2rev[tracking[remote]], remote): |
1271 elif self._gitisancestor(branch2rev[tracking[remote]], remote): |
1272 # When updating to a tracked remote branch, |
1272 # When updating to a tracked remote branch, |
1273 # if the local tracking branch is downstream of it, |
1273 # if the local tracking branch is downstream of it, |
1274 # a normal `git pull` would have performed a "fast-forward merge" |
1274 # a normal `git pull` would have performed a "fast-forward merge" |