Fix `git-llvm` script to handle `git worktree` setups correctly

llvm-svn: 286140
This commit is contained in:
Mehdi Amini 2016-11-07 20:35:02 +00:00
parent f1271c8d08
commit f95a459d59
1 changed files with 2 additions and 1 deletions

View File

@ -221,7 +221,8 @@ def cmd_push(args):
os.chdir(git_root)
# We need a staging area for SVN, let's hide it in the .git directory.
svn_root = os.path.join(git_root, '.git', 'llvm-upstream-svn')
dot_git_dir = git('rev-parse', '--git-common-dir')
svn_root = os.path.join(dot_git_dir, 'llvm-upstream-svn')
svn_init(svn_root)
rev_range = args.rev_range