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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286140 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm
index c5159aebec468935537cbe25362b8b03aea0d9fc..de7d89dc666e13f1396209121b452aefb1c48db6 100755 (executable)
--- a/utils/git-svn/git-llvm
+++ b/utils/git-svn/git-llvm
@@ -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