summaryrefslogtreecommitdiff
path: root/.reviewboardrc
diff options
context:
space:
mode:
authorChristian Hammond <chipx86@chipx86.com>2009-11-03 01:24:11 -0800
committerChristian Hammond <chipx86@chipx86.com>2009-11-03 01:24:11 -0800
commit5985a3192e52832a5bfb05d7071cb00d93e17c63 (patch)
tree524d70d3271f553ec5aebad59c786627adbe6b18 /.reviewboardrc
parent6b3895ebdd1578bef3c0fcb69621307e5282b7f3 (diff)
Improve git parent branch detection in post-review.
This adds improved logic for determining the parent branch used when generating a diff. It will attempt to detect the merge base of the current head, falling back to defaults if necessary. A tracking branch can be manually specified too. The new code attempts the following: 1) Tries to detect the tracking branch for the current HEAD, if possible. 2) If a tracking branch doesn't exist, or is not remote, it will fall back on 'origin/master'. 3) If the --tracking-branch parameter is specified, this branch will be used instead of 'origin/master'. It also provides unit tests for post-review. Right now, these test only GitClient (in pure Git mode), but new tests can be added down the line for the rest of post-review. Patch by Dan Savilonis Reviewed at http://reviews.reviewboard.org/r/1144/
Diffstat (limited to '.reviewboardrc')
0 files changed, 0 insertions, 0 deletions