Split --tracking-branch option into new group; pass it to rbt land

Review Request #8337 — Created Aug. 18, 2016 and submitted

brennie
RBTools
release-0.7.x
4161
c50bbcb...
rbtools

The --tracking-branch option is required for determining the upstream
branch for rbt land, but it was not passed in due to it being in the
diff_options group. It is now in its own option group,
branch_options, which is passed to all commands that accepted
diff_options as well as rbt land. This fixes an issue where
repositories that don't use the default (e.g., origin/master for git)
tracking branch would try to push to a non-existant branch.

With this patch applied, I am able to do rbt land --push when the
upstream branch is not origin/master.

reviewbot
  1. Tool: Pyflakes
    Processed Files:
        rbtools/commands/land.py
        rbtools/commands/post.py
        rbtools/commands/stamp.py
        rbtools/commands/__init__.py
        rbtools/commands/diff.py
    
    
    
    Tool: PEP8 Style Checker
    Processed Files:
        rbtools/commands/land.py
        rbtools/commands/post.py
        rbtools/commands/stamp.py
        rbtools/commands/__init__.py
        rbtools/commands/diff.py
    
    
  2. 
      
david
  1. Ship It!
  2. 
      
brennie
Review request changed

Status: Closed (submitted)

Change Summary:

Pushed to release-0.7.x (ce3d4d6)
Loading...