Browse Source

Switch to -u from deprecated --set-upstream

tags/v1.6.0
James Moger 10 years ago
parent
commit
d69d73e5da

+ 1
- 1
src/main/java/com/gitblit/wicket/pages/propose_git.md View File

cd ${repo} cd ${repo}
git checkout -b ${reviewBranch} origin/${integrationBranch} git checkout -b ${reviewBranch} origin/${integrationBranch}
... ...
git push --set-upstream origin ${reviewBranch}
git push -u origin ${reviewBranch}



+ 1
- 1
src/main/java/pt.py View File

# set the upstream branch configuration # set the upstream branch configuration
args.id = int(fields[1].strip()[len('--> #'):]) args.id = int(fields[1].strip()[len('--> #'):])
__call(['git', 'fetch', args.remote]) __call(['git', 'fetch', args.remote])
__call(['git', 'branch', '--set-upstream-to={}/ticket/{:d}'.format(args.remote, args.id)])
__call(['git', 'branch', '-u', '{}/ticket/{:d}'.format(args.remote, args.id)])
break break


return return

+ 2
- 2
src/site/tickets_using.mkd View File

...add a single commit... ...add a single commit...
git push origin HEAD:refs/for/new git push origin HEAD:refs/for/new
# read ticket id from server output # read ticket id from server output
git branch --set-upstream-to=origin/ticket/{id}
git branch -u origin/ticket/{id}


### Creating the first Patchset for an Existing Ticket ### Creating the first Patchset for an Existing Ticket


cd repo cd repo
git checkout -b ticket/{id} git checkout -b ticket/{id}
...add one or more commits... ...add one or more commits...
git push --set-upstream origin ticket/{id}
git push -u origin ticket/{id}


### Safely adding commits to a Patchset for an Existing Ticket ### Safely adding commits to a Patchset for an Existing Ticket



Loading…
Cancel
Save