Merged #59 "Update git ticket instructions for deprecated --set-upstream"

James Moger

2014-05-05 c57b583ef60442f86085285bddc946c18ac1cc18

Merged #59 "Update git ticket instructions for deprecated --set-upstream"

 src/main/java/com/gitblit/wicket/pages/propose_git.md

@@ -2,5 +2,5 @@
    cd ${repo}
    git checkout -b ${reviewBranch} origin/${integrationBranch}
    ...
    git push --set-upstream origin ${reviewBranch}
    git push -u origin ${reviewBranch}


 src/main/java/pt.py

@@ -289,7 +289,7 @@
            # set the upstream branch configuration
            args.id = int(fields[1].strip()[len('--> #'):])
            __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

    return

 src/site/tickets_using.mkd

@@ -28,7 +28,7 @@
    ...add a single commit...
    git push origin HEAD:refs/for/new
    # 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

@@ -42,7 +42,7 @@
    cd repo
    git checkout -b ticket/{id}
    ...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