diff options
| author | Christian Hammond <chipx86@chipx86.com> | 2010-01-12 01:37:46 -0800 |
|---|---|---|
| committer | Christian Hammond <chipx86@chipx86.com> | 2010-01-12 01:39:43 -0800 |
| commit | 7c2e3186477c529008fc69921e39509c1c93ae06 (patch) | |
| tree | 9f77b56c2bacc53f6f506711fe0e3f3a716213cd | |
| parent | 595d137d564bd553c00d25f2be39ceaa262f4f1d (diff) | |
Fix an assumption that Git master represents SVN trunk.
post-review makes an assumption that the 'master' branch in a Git repository
represents SVN's 'trunk' when using git-svn. Now it uses the calculated
parent branch, which may be 'master' or may be some other branch, depending
on the repository setup.
Patch by Mike Crute
Reviewed at http://reviews.reviewboard.org/r/1307/
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rwxr-xr-x | rbtools/postreview.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -17,6 +17,7 @@ Contributors: * Lepton Wu * Luke Lu * Matthew Woehlke + * Mike Crute * Paul Scott * Raghu Kaippully * Ravi Kondamuru diff --git a/rbtools/postreview.py b/rbtools/postreview.py index 9b422c4..a313a79 100755 --- a/rbtools/postreview.py +++ b/rbtools/postreview.py @@ -2160,7 +2160,7 @@ class GitClient(SCMClient): svn diff would generate. This is needed so the SVNTool in Review Board can properly parse this diff. """ - rev = execute(["git", "svn", "find-rev", "master"]).strip() + rev = execute(["git", "svn", "find-rev", parent_branch]).strip() if not rev: return None |