I can get the behavior I want by adding the following to my .reviewboardrc:
# .reviewboardrc
_MERGE_BASE_CMD = ["git", "merge-base", "origin/master", "HEAD", ]
_merge_base = subprocess.Popen(_MERGE_BASE_CMD,
stdout=subprocess.PIPE
).communicate()[0].strip().decode('utf-8')
TRACKING_BRANCH = _merge_base
... however it gives me an ugly (and I daresay, incorrect) warning message
before showing the (correct!) diff output:
WARNING: Could not determine specific upstream remote to use for diffs. We
recommend setting TRACKING_BRANCH in reviewboardrc to your nearest upstream
remote branch.
--
Supercharge your Review Board with Power Pack:
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons:
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
---
You received this message because you are subscribed to the Google Groups
"Review Board Community" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/reviewboard/be602eac-61c3-4d23-a1d3-2494b23c566d%40googlegroups.com.
