From 59bbd3ca9eed1371e674dcc519e55373e51ee560 Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Mon, 7 Nov 2016 20:35:02 +0000 Subject: [PATCH] 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 --- utils/git-svn/git-llvm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm index c5159aebec4..de7d89dc666 100755 --- 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 -- 2.49.0